procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix and expand tests broken by commit 2772ebe366 of 2022-11-28

Browse source 
* test/lisp/emacs-lisp/comp-tests.el
(with-test-native-compile-prune-cache)
(test-native-compile-prune-cache)
(test-native-compile-prune-cache/delete-only-eln)
(test-native-compile-prune-cache/dont-delete-in-parent-of-cache):
Check that the last directory in `native-comp-eln-load-path' is
not affected by `native-compile-prune-cache'.
This commit is contained in:
Juanma Barranquero 2022-12-03 12:01:10 +01:00
parent a0dd9fdebe
commit bd58dcedfb
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
test/lisp/emacs-lisp/comp-tests.el
View file

@ -31,25 +31,30 @@
(defmacro with-test-native-compile-prune-cache (&rest body) (defmacro with-test-native-compile-prune-cache (&rest body)
(declare (indent 0) (debug t)) (declare (indent 0) (debug t))
`(ert-with-temp-directory testdir `(ert-with-temp-directory testdir
(setq testdir (expand-file-name "eln-cache" testdir)) (let ((usr-cache (expand-file-name "eln-usr-cache" testdir))
(make-directory testdir) (sys-cache (expand-file-name "eln-sys-cache" testdir)))
(let* ((c1 (expand-file-name "29.0.50-cur" testdir)) (make-directory usr-cache)
(c2 (expand-file-name "29.0.50-old" testdir)) (make-directory sys-cache)
(native-comp-eln-load-path (list testdir)) (let* ((c1 (expand-file-name "29.0.50-cur" usr-cache))
(comp-native-version-dir "29.0.50-cur")) (c2 (expand-file-name "29.0.50-old" usr-cache))
(dolist (d (list c1 c2)) (s1 (expand-file-name "29.0.50-cur" sys-cache))
(make-directory d) (s2 (expand-file-name "preloaded" s1))
(with-temp-file (expand-file-name "some.eln" d) (insert "foo")) (native-comp-eln-load-path (list usr-cache sys-cache))
(with-temp-file (expand-file-name "some.eln.tmp" d) (insert "foo"))) (comp-native-version-dir "29.0.50-cur"))
,@body))) (dolist (d (list c1 c2 s1 s2))
(make-directory d)
(with-temp-file (expand-file-name "some.eln" d) (insert "foo"))
(with-temp-file (expand-file-name "some.eln.tmp" d) (insert "foo")))
,@body))))
(ert-deftest test-native-compile-prune-cache () (ert-deftest test-native-compile-prune-cache ()
(skip-unless (featurep 'native-compile)) (skip-unless (featurep 'native-compile))
(with-test-native-compile-prune-cache (with-test-native-compile-prune-cache
(native-compile-prune-cache) (native-compile-prune-cache)
(should (file-directory-p c1)) (dolist (d (list c1 s1 s2))
(should (file-regular-p (expand-file-name "some.eln" c1))) (should (file-directory-p d))
(should (file-regular-p (expand-file-name "some.eln.tmp" c1))) (should (file-regular-p (expand-file-name "some.eln" d)))
(should (file-regular-p (expand-file-name "some.eln.tmp" d))))
(should-not (file-directory-p c2)) (should-not (file-directory-p c2))
(should-not (file-regular-p (expand-file-name "some.eln" c2))) (should-not (file-regular-p (expand-file-name "some.eln" c2)))
(should-not (file-regular-p (expand-file-name "some.eln.tmp" c2))))) (should-not (file-regular-p (expand-file-name "some.eln.tmp" c2)))))
@ -57,21 +62,23 @@
(ert-deftest test-native-compile-prune-cache/delete-only-eln () (ert-deftest test-native-compile-prune-cache/delete-only-eln ()
(skip-unless (featurep 'native-compile)) (skip-unless (featurep 'native-compile))
(with-test-native-compile-prune-cache (with-test-native-compile-prune-cache
(with-temp-file (expand-file-name "keep1.txt" c1) (insert "foo")) (dolist (d (list c1 c2 s1 s2))
(with-temp-file (expand-file-name "keep2.txt" c2) (insert "foo")) (with-temp-file (expand-file-name "keep.txt" d) (insert "foo")))
(native-compile-prune-cache) (native-compile-prune-cache)
(should (file-regular-p (expand-file-name "keep1.txt" c1))) (dolist (d (list c1 c2 s1 s2))
(should (file-regular-p (expand-file-name "keep2.txt" c2))))) (should (file-regular-p (expand-file-name "keep.txt" d))))))
(ert-deftest test-native-compile-prune-cache/dont-delete-in-parent-of-cache () (ert-deftest test-native-compile-prune-cache/dont-delete-in-parent-of-cache ()
(skip-unless (featurep 'native-compile)) (skip-unless (featurep 'native-compile))
(with-test-native-compile-prune-cache (with-test-native-compile-prune-cache
(let ((f1 (expand-file-name "../some.eln" testdir)) (let ((f1 (expand-file-name "../some.eln" usr-cache))
(f2 (expand-file-name "some.eln" testdir))) (f2 (expand-file-name "some.eln" usr-cache))
(with-temp-file f1 (insert "foo")) (f3 (expand-file-name "../some.eln" sys-cache))
(with-temp-file f2 (insert "foo")) (f4 (expand-file-name "some.eln" sys-cache)))
(dolist (f (list f1 f2 f3 f4))
(with-temp-file f (insert "foo")))
(native-compile-prune-cache) (native-compile-prune-cache)
(should (file-regular-p f1)) (dolist (f (list f1 f2 f3 f4))
(should (file-regular-p f2))))) (should (file-regular-p f))))))
;;; comp-tests.el ends here ;;; comp-tests.el ends here