* 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'.

diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 28adb64b8c1d59c5b88eead7d480cebe6f5d3d77..8ec32fb041a9d8639f3917f0499d1200769b2d91 100644 (file)
--- 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 ()
   "<https://lists.gnu.org/archive/html/bug-gnu-emacs/2020-12/msg01994.html>"
-  (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))