diff options
| author | Glenn Morris | 2017-05-09 23:20:52 -0700 |
|---|---|---|
| committer | Glenn Morris | 2017-05-09 23:20:52 -0700 |
| commit | 48e6e9a939cd0442497ee2e7b317d94ff9103cfb (patch) | |
| tree | fd58d290a726f91cf51178206833e86735ddd5bd /test/src | |
| parent | 4f391b9d6d8e117336ac758a168ae7c13198fda2 (diff) | |
| download | emacs-48e6e9a939cd0442497ee2e7b317d94ff9103cfb.tar.gz emacs-48e6e9a939cd0442497ee2e7b317d94ff9103cfb.zip | |
Fix finding test .el files
* test/Makefile.in (ELFILES): Exclude the data/ directory.
* test/src/lread-tests.el (lread-test-bug26837): Revert previous.
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/lread-tests.el | 15 |
1 files changed, 7 insertions, 8 deletions
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)." | |||
| 147 | (let ((load-path (cons | 147 | (let ((load-path (cons |
| 148 | (file-name-as-directory | 148 | (file-name-as-directory |
| 149 | (expand-file-name "data" (getenv "EMACS_TEST_DIRECTORY"))) | 149 | (expand-file-name "data" (getenv "EMACS_TEST_DIRECTORY"))) |
| 150 | load-path)) | 150 | load-path))) |
| 151 | (fn (lambda (lib) | 151 | (load "somelib" nil t) |
| 152 | (load lib nil t) | 152 | (should (string-suffix-p "/somelib.el" (caar load-history))) |
| 153 | (let ((str (caar load-history))) | 153 | (load "somelib2" nil t) |
| 154 | (should (or (string-suffix-p (concat "/" lib ".el") str) | 154 | (should (string-suffix-p "/somelib2.el" (caar load-history))) |
| 155 | (string-suffix-p (concat "/" lib ".elc") str))))))) | 155 | (load "somelib" nil t) |
| 156 | (dolist (lib '("somelib" "somelib2" "somelib")) | 156 | (should (string-suffix-p "/somelib.el" (caar load-history))))) |
| 157 | (funcall fn lib)))) | ||
| 158 | 157 | ||
| 159 | ;;; lread-tests.el ends here | 158 | ;;; lread-tests.el ends here |