diff options
Diffstat (limited to 'test/src/comp-tests.el')
| -rw-r--r-- | test/src/comp-tests.el | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el index 8ec32fb041a..a1893fde5c0 100644 --- a/test/src/comp-tests.el +++ b/test/src/comp-tests.el @@ -26,18 +26,12 @@ ;;; Code: (require 'ert) +(require 'ert-x) (require 'cl-lib) -(defconst comp-test-directory (concat (file-name-directory - (or load-file-name - buffer-file-name)) - "comp-tests-resources/")) +(defconst comp-test-src (ert-resource-file "comp-test-funcs.el")) -(defconst comp-test-src - (expand-file-name "comp-test-funcs.el" comp-test-directory)) - -(defconst comp-test-dyn-src - (expand-file-name"comp-test-funcs-dyn.el" comp-test-directory)) +(defconst comp-test-dyn-src (ert-resource-file "comp-test-funcs-dyn.el")) (when (featurep 'nativecomp) (require 'comp) @@ -61,7 +55,7 @@ Check that the resulting binaries do not differ." :tags '(:expensive-test :nativecomp) (let* ((byte-native-for-bootstrap t) ; FIXME HACK (comp-src (expand-file-name "../../../lisp/emacs-lisp/comp.el" - comp-test-directory)) + (ert-resource-directory))) (comp1-src (make-temp-file "stage1-" nil ".el")) (comp2-src (make-temp-file "stage2-" nil ".el")) ;; Can't use debug symbols. @@ -497,8 +491,7 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html." (comp-deftest 45603-1 () "<https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-12/msg01994.html>" - (load (native-compile (expand-file-name "comp-test-45603.el" - comp-test-directory))) + (load (native-compile (ert-resource-file "comp-test-45603.el"))) (should (fboundp #'comp-test-45603--file-local-name))) (comp-deftest 46670-1 () @@ -1409,8 +1402,7 @@ Return a list of results." (let ((comp-speed 3) (comp-post-pass-hooks '((comp-final comp-tests-pure-checker-1 comp-tests-pure-checker-2)))) - (load (native-compile (expand-file-name "comp-test-pure.el" - comp-test-directory))) + (load (native-compile (ert-resource-file "comp-test-pure.el"))) (should (subr-native-elisp-p (symbol-function #'comp-tests-pure-caller-f))) (should (= (comp-tests-pure-caller-f) 4)) |