martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't prune *.eln files in parent of eln-load-path

Browse Source 
* lisp/emacs-lisp/comp.el (native-compile-prune-cache): Don't
prune *.eln files in parent directory of `native-comp-eln-load-path'.
* test/lisp/emacs-lisp/comp-tests.el
(test-native-compile-prune-cache/dont-delete-in-parent-of-cache):
New test.
This commit is contained in:
Stefan Kangas
2022-10-17 15:26:21 +02:00
parent 24b85b10e3
commit 40b734c500
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/emacs-lisp/comp.el
View File

@@ -4334,7 +4334,9 @@ of (commands) to run simultaneously."
;; `invocation-directory'.
(setq dir (expand-file-name dir invocation-directory))
(when (file-exists-p dir)
(dolist (subdir (directory-files dir t))
(dolist (subdir (seq-filter
(lambda (f) (not (string-match (rx "/." (? ".") eos) f)))
(directory-files dir t)))
(when (and (file-directory-p subdir)
(file-writable-p subdir)
(not (equal (file-name-nondirectory

11
test/lisp/emacs-lisp/comp-tests.el
View File

@@ -59,4 +59,15 @@
(should (file-regular-p (expand-file-name "keep1.txt" c1)))
(should (file-regular-p (expand-file-name "keep2.txt" c2)))))
(ert-deftest test-native-compile-prune-cache/dont-delete-in-parent-of-cache ()
(skip-unless (featurep 'native-compile))
(with-test-native-compile-prune-cache
(let ((f1 (expand-file-name "some.eln" (expand-file-name ".." testdir)))
(f2 (expand-file-name "some.eln" testdir)))
(with-temp-file f1 (insert "foo"))
(with-temp-file f2 (insert "foo"))
(native-compile-prune-cache)
(should (file-regular-p f1))
(should (file-regular-p f2)))))
;;; comp-tests.el ends here