diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-05-09 23:20:52 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-05-09 23:20:52 -0700 |
| commit | 48e6e9a939cd0442497ee2e7b317d94ff9103cfb (patch) | |
| tree | fd58d290a726f91cf51178206833e86735ddd5bd | |
| parent | 4f391b9d6d8e117336ac758a168ae7c13198fda2 (diff) | |
| download | emacs-48e6e9a939cd0442497ee2e7b317d94ff9103cfb.tar.gz | |
Fix finding test .el files
* test/Makefile.in (ELFILES): Exclude the data/ directory.
* test/src/lread-tests.el (lread-test-bug26837): Revert previous.
| -rw-r--r-- | test/Makefile.in | 1 | ||||
| -rw-r--r-- | test/src/lread-tests.el | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 03ae32e3a62..4029bb2431e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -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) diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el index 80bc0c4a857..0427fe64e4a 100644 --- a/test/src/lread-tests.el +++ b/test/src/lread-tests.el @@ -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 |