Skip to content

Commit cc1f4e1

Browse files
committed
fix(ert): ERT test fails on Emacs 30+
1 parent 08659b1 commit cc1f4e1

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

lisp/_prepare.el

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,10 @@ workspace has no valid Eask-file; it will load global workspace instead."
172172
173173
This is added because we don't want to pollute `error' and `warn' functions."
174174
(eask-command-p '("load" "exec" "emacs" "eval" "repl"
175-
"run/script" "run/command")))
175+
"run/script" "run/command"
176+
;; NOTE: These test commands handle the exit code themselves;
177+
;; therefore, we don't need to handle it for them!
178+
"test/ert" "test/ert-runner")))
176179

177180
(defun eask-checker-p ()
178181
"Return t if running Eask as the checker.
@@ -1129,11 +1132,11 @@ This uses function `locate-dominating-file' to look up directory tree."
11291132
"Set up config directory in DIR, then execute BODY."
11301133
(declare (indent 1) (debug t))
11311134
`(let* ((user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/") ,dir))
1132-
(package-user-dir (expand-file-name "elpa" user-emacs-directory))
1133-
(early-init-file (locate-user-emacs-file "early-init.el"))
1134-
(eask-dot-emacs-file (locate-user-emacs-file ".emacs"))
1135-
(user-init-file (locate-user-emacs-file "init.el"))
1136-
(custom-file (locate-user-emacs-file "custom.el")))
1135+
(package-user-dir (expand-file-name "elpa" user-emacs-directory))
1136+
(early-init-file (locate-user-emacs-file "early-init.el"))
1137+
(eask-dot-emacs-file (locate-user-emacs-file ".emacs"))
1138+
(user-init-file (locate-user-emacs-file "init.el"))
1139+
(custom-file (locate-user-emacs-file "custom.el")))
11371140
,@body))
11381141

11391142
;; NOTE: If you modified this function, make sure you modified `core/emacs.el'
@@ -1161,9 +1164,9 @@ This uses function `locate-dominating-file' to look up directory tree."
11611164
(eask--handle-global-options)
11621165
(cond
11631166
((eask-config-p)
1164-
(let ((early-init-file (locate-user-emacs-file "early-init.el"))
1167+
(let ((early-init-file (locate-user-emacs-file "early-init.el"))
11651168
(eask-dot-emacs-file (locate-user-emacs-file "../.emacs"))
1166-
(user-init-file (locate-user-emacs-file "init.el")))
1169+
(user-init-file (locate-user-emacs-file "init.el")))
11671170
;; We accept Eask-file in `config' scope, but it shouldn't be used
11681171
;; for the sandbox.
11691172
(eask-with-verbosity 'debug

0 commit comments

Comments
 (0)