From: Glenn Morris <rgm@gnu.org>
Date: Sun, 17 Jun 2018 17:22:28 +0000 (-0700)
Subject: * test/lisp/simple-tests.el (simple-tests-async-shell-command-30280):
X-Git-Tag: emacs-27.0.90~4814
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d1b774dbc31b753527321ae1e441d5e424a5265;p=emacs.git

* test/lisp/simple-tests.el (simple-tests-async-shell-command-30280):
Use the correct emacs executable, not first in PATH.
---

diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 678d9b9385a..417aa648edf 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -533,7 +533,9 @@ See Bug#21722."
          (second (generate-new-buffer-name base))
          ;; `save-window-excursion' doesn't restore frame configurations.
          (pop-up-frames nil)
-         (inhibit-message t))
+         (inhibit-message t)
+         (emacs (expand-file-name invocation-name invocation-directory)))
+    (skip-unless (file-executable-p emacs))
     ;; Let `shell-command' create the buffer as needed.
     (kill-buffer first)
     (unwind-protect
@@ -544,7 +546,7 @@ See Bug#21722."
           ;; `accept-process-output' is called on the second command.
           (dolist (form '("(sleep-for 8)" "(message \"\")"))
             (async-shell-command (format "%s -Q -batch -eval '%s'"
-                                         invocation-name form)
+                                         emacs form)
                                  first))
           ;; First command should neither have nor display output.
           (let* ((buffer (get-buffer first))