fix(ert): ERT test fails on Emacs 30+

emacs-eask · Nov 2, 2024 · cc1f4e1 · cc1f4e1
1 parent 08659b1
commit cc1f4e1
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lisp/_prepare.el b/lisp/_prepare.el
@@ -172,7 +172,10 @@ workspace has no valid Eask-file; it will load global workspace instead."
 
 This is added because we don't want to pollute `error' and `warn' functions."
   (eask-command-p '("load" "exec" "emacs" "eval" "repl"
-                    "run/script" "run/command")))
+                    "run/script" "run/command"
+                    ;; NOTE: These test commands handle the exit code themselves;
+                    ;; therefore, we don't need to handle it for them!
+                    "test/ert" "test/ert-runner")))
 
 (defun eask-checker-p ()
   "Return t if running Eask as the checker.
@@ -1129,11 +1132,11 @@ This uses function `locate-dominating-file' to look up directory tree."
   "Set up config directory in DIR, then execute BODY."
   (declare (indent 1) (debug t))
   `(let* ((user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/") ,dir))
-          (package-user-dir (expand-file-name "elpa" user-emacs-directory))
-          (early-init-file (locate-user-emacs-file "early-init.el"))
-          (eask-dot-emacs-file (locate-user-emacs-file ".emacs"))
-          (user-init-file (locate-user-emacs-file "init.el"))
-          (custom-file (locate-user-emacs-file "custom.el")))
+          (package-user-dir     (expand-file-name "elpa" user-emacs-directory))
+          (early-init-file      (locate-user-emacs-file "early-init.el"))
+          (eask-dot-emacs-file  (locate-user-emacs-file ".emacs"))
+          (user-init-file       (locate-user-emacs-file "init.el"))
+          (custom-file          (locate-user-emacs-file "custom.el")))
      ,@body))
 
 ;; 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."
          (eask--handle-global-options)
          (cond
           ((eask-config-p)
-           (let ((early-init-file (locate-user-emacs-file "early-init.el"))
+           (let ((early-init-file     (locate-user-emacs-file "early-init.el"))
                  (eask-dot-emacs-file (locate-user-emacs-file "../.emacs"))
-                 (user-init-file (locate-user-emacs-file "init.el")))
+                 (user-init-file      (locate-user-emacs-file "init.el")))
              ;; We accept Eask-file in `config' scope, but it shouldn't be used
              ;; for the sandbox.
              (eask-with-verbosity 'debug