diff options
| author | Glenn Morris | 2018-06-17 10:22:28 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-06-17 10:22:28 -0700 |
| commit | 2d1b774dbc31b753527321ae1e441d5e424a5265 (patch) | |
| tree | a82bad0f6c2e42635083b694d8954360c2f86054 | |
| parent | 45ee24efed57093b421159ca1028097952f2d564 (diff) | |
| download | emacs-2d1b774dbc31b753527321ae1e441d5e424a5265.tar.gz emacs-2d1b774dbc31b753527321ae1e441d5e424a5265.zip | |
* test/lisp/simple-tests.el (simple-tests-async-shell-command-30280):
Use the correct emacs executable, not first in PATH.
| -rw-r--r-- | test/lisp/simple-tests.el | 6 |
1 files changed, 4 insertions, 2 deletions
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." | |||
| 533 | (second (generate-new-buffer-name base)) | 533 | (second (generate-new-buffer-name base)) |
| 534 | ;; `save-window-excursion' doesn't restore frame configurations. | 534 | ;; `save-window-excursion' doesn't restore frame configurations. |
| 535 | (pop-up-frames nil) | 535 | (pop-up-frames nil) |
| 536 | (inhibit-message t)) | 536 | (inhibit-message t) |
| 537 | (emacs (expand-file-name invocation-name invocation-directory))) | ||
| 538 | (skip-unless (file-executable-p emacs)) | ||
| 537 | ;; Let `shell-command' create the buffer as needed. | 539 | ;; Let `shell-command' create the buffer as needed. |
| 538 | (kill-buffer first) | 540 | (kill-buffer first) |
| 539 | (unwind-protect | 541 | (unwind-protect |
| @@ -544,7 +546,7 @@ See Bug#21722." | |||
| 544 | ;; `accept-process-output' is called on the second command. | 546 | ;; `accept-process-output' is called on the second command. |
| 545 | (dolist (form '("(sleep-for 8)" "(message \"\")")) | 547 | (dolist (form '("(sleep-for 8)" "(message \"\")")) |
| 546 | (async-shell-command (format "%s -Q -batch -eval '%s'" | 548 | (async-shell-command (format "%s -Q -batch -eval '%s'" |
| 547 | invocation-name form) | 549 | emacs form) |
| 548 | first)) | 550 | first)) |
| 549 | ;; First command should neither have nor display output. | 551 | ;; First command should neither have nor display output. |
| 550 | (let* ((buffer (get-buffer first)) | 552 | (let* ((buffer (get-buffer first)) |