From 9d34fd8b33c55768190d41239931120e3fc9717f Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Mon, 26 Apr 2021 17:28:38 +0200 Subject: [PATCH] * Use `expand-file-name' in place of `concat' in comp-tests.el * test/src/comp-tests.el (comp-test-src, comp-test-dyn-src) (comp-tests-bootstrap, comp-tests-pure, comp-test-src): Use `expand-file-name' in place of `concat'. --- test/src/comp-tests.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el index 28adb64b8c1..8ec32fb041a 100644 --- a/test/src/comp-tests.el +++ b/test/src/comp-tests.el @@ -34,10 +34,10 @@ "comp-tests-resources/")) (defconst comp-test-src - (concat comp-test-directory "comp-test-funcs.el")) + (expand-file-name "comp-test-funcs.el" comp-test-directory)) (defconst comp-test-dyn-src - (concat comp-test-directory "comp-test-funcs-dyn.el")) + (expand-file-name"comp-test-funcs-dyn.el" comp-test-directory)) (when (featurep 'nativecomp) (require 'comp) @@ -60,8 +60,8 @@ Check that the resulting binaries do not differ." :tags '(:expensive-test :nativecomp) (let* ((byte-native-for-bootstrap t) ; FIXME HACK - (comp-src (concat comp-test-directory - "../../lisp/emacs-lisp/comp.el")) + (comp-src (expand-file-name "../../../lisp/emacs-lisp/comp.el" + comp-test-directory)) (comp1-src (make-temp-file "stage1-" nil ".el")) (comp2-src (make-temp-file "stage2-" nil ".el")) ;; Can't use debug symbols. @@ -497,7 +497,8 @@ https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-03/msg00914.html." (comp-deftest 45603-1 () "" - (load (native-compile (concat comp-test-directory "comp-test-45603.el"))) + (load (native-compile (expand-file-name "comp-test-45603.el" + comp-test-directory))) (should (fboundp #'comp-test-45603--file-local-name))) (comp-deftest 46670-1 () @@ -1408,7 +1409,8 @@ 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 (concat comp-test-directory "comp-test-pure.el"))) + (load (native-compile (expand-file-name "comp-test-pure.el" + comp-test-directory))) (should (subr-native-elisp-p (symbol-function #'comp-tests-pure-caller-f))) (should (= (comp-tests-pure-caller-f) 4)) -- 2.39.5