From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 13 May 2020 18:48:57 +0000 (+0100)
Subject: * test/src/comp-tests.el (comp-tests-bootstrap): Fix test.
X-Git-Tag: emacs-28.0.90~2727^2~653
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28df049b8d43586d5a91a7b3e1d9e05131572afc;p=emacs.git

* test/src/comp-tests.el (comp-tests-bootstrap): Fix test.
---

diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 4768e1a1ace..ce98227162f 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -44,21 +44,20 @@ Check that the resulting binaries do not differ."
                            "../../lisp/emacs-lisp/comp.el"))
          (comp1-src (make-temp-file "stage1-" nil ".el"))
          (comp2-src (make-temp-file "stage2-" nil ".el"))
-         (comp1 (concat comp1-src "n"))
-         (comp2 (concat comp2-src "n"))
          ;; Can't use debug symbols.
          (comp-debug 0))
     (copy-file comp-src comp1-src t)
     (copy-file comp-src comp2-src t)
     (load (concat comp-src "c") nil nil t t)
-    (should (null (subr-native-elisp-p (symbol-function #'native-compile))))
+    (should-not (subr-native-elisp-p (symbol-function #'native-compile)))
     (message "Compiling stage1...")
-    (load (native-compile comp1-src) nil nil t t)
-    (should (subr-native-elisp-p (symbol-function 'native-compile)))
-    (message "Compiling stage2...")
-    (native-compile comp2-src)
-    (message "Comparing %s %s" comp1 comp2)
-    (should (= (call-process "cmp" nil nil nil comp1 comp2) 0))))
+    (let ((comp1-eln (native-compile comp1-src)))
+      (load comp1-eln nil nil t t)
+      (should (subr-native-elisp-p (symbol-function 'native-compile)))
+      (message "Compiling stage2...")
+      (let ((comp2-eln (native-compile comp2-src)))
+        (message "Comparing %s %s" comp1-eln comp2-eln)
+        (should (= (call-process "cmp" nil nil nil comp1-eln comp2-eln) 0))))))
 
 (ert-deftest comp-tests-provide ()
   "Testing top level provide."