procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix finding test .el files

Browse source 
* test/Makefile.in (ELFILES): Exclude the data/ directory.
* test/src/lread-tests.el (lread-test-bug26837): Revert previous.
This commit is contained in:
Glenn Morris 2017-05-09 23:20:52 -07:00
parent 4f391b9d6d
commit 48e6e9a939
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/Makefile.in
View file

@ -132,6 +132,7 @@ maybe_exclude_module_tests := -name emacs-module-tests.el -prune -o
endif
ELFILES := $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \
-path "${srcdir}/data" -prune -o \
-name "*resources" -prune -o \
${maybe_exclude_module_tests} \
-name "*.el" -print)

15
test/src/lread-tests.el
View file

@ -147,13 +147,12 @@ literals (Bug#20852)."
(let ((load-path (cons
(file-name-as-directory
(expand-file-name "data" (getenv "EMACS_TEST_DIRECTORY")))
load-path))
(fn (lambda (lib)
(load lib nil t)
(let ((str (caar load-history)))
(should (or (string-suffix-p (concat "/" lib ".el") str)
(string-suffix-p (concat "/" lib ".elc") str)))))))
(dolist (lib '("somelib" "somelib2" "somelib"))
(funcall fn lib))))
load-path)))
(load "somelib" nil t)
(should (string-suffix-p "/somelib.el" (caar load-history)))
(load "somelib2" nil t)
(should (string-suffix-p "/somelib2.el" (caar load-history)))
(load "somelib" nil t)
(should (string-suffix-p "/somelib.el" (caar load-history)))))
;;; lread-tests.el ends here