diff options
| author | Eli Zaretskii | 2022-02-24 22:02:28 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2022-02-24 22:02:28 +0200 |
| commit | 8d2fbd4a146bcd01fd905fb500230c7c662f2a01 (patch) | |
| tree | 05b9ca39d51148b0a4d6f11069bbb77b352d05f9 /test/lisp/eshell | |
| parent | 794fbd1c07696a87352ddd9703bb2f8f6a7945ff (diff) | |
| download | emacs-8d2fbd4a146bcd01fd905fb500230c7c662f2a01.tar.gz emacs-8d2fbd4a146bcd01fd905fb500230c7c662f2a01.zip | |
Fix esh-proc-tests on MS-Windows
* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill-pipeline)
(esh-proc-test/kill-background-process): Fix tests on MS-Windows.
Diffstat (limited to 'test/lisp/eshell')
| -rw-r--r-- | test/lisp/eshell/esh-proc-tests.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el index a8be0f8030b..e19eaf9779b 100644 --- a/test/lisp/eshell/esh-proc-tests.el +++ b/test/lisp/eshell/esh-proc-tests.el | |||
| @@ -59,7 +59,8 @@ prompt. See bug#54136." | |||
| 59 | (eshell-wait-for-subprocess t) | 59 | (eshell-wait-for-subprocess t) |
| 60 | (should (equal (buffer-substring-no-properties | 60 | (should (equal (buffer-substring-no-properties |
| 61 | output-start (eshell-end-of-output)) | 61 | output-start (eshell-end-of-output)) |
| 62 | "killed\n"))))) | 62 | ;; "interrupt\n" is for MS-Windows. |
| 63 | (or "interrupt\n" "killed\n")))))) | ||
| 63 | 64 | ||
| 64 | (ert-deftest esh-proc-test/kill-pipeline-head () | 65 | (ert-deftest esh-proc-test/kill-pipeline-head () |
| 65 | "Test that killing the first process in a pipeline doesn't | 66 | "Test that killing the first process in a pipeline doesn't |
| @@ -88,4 +89,4 @@ prompt. See bug#54136." | |||
| 88 | (kill-process (caar eshell-process-list)) | 89 | (kill-process (caar eshell-process-list)) |
| 89 | ;; Give `eshell-sentinel' a chance to run. | 90 | ;; Give `eshell-sentinel' a chance to run. |
| 90 | (sit-for 0.1) | 91 | (sit-for 0.1) |
| 91 | (eshell-match-result "\\[sh\\] [[:digit:]]+\n"))) | 92 | (eshell-match-result "\\[sh\\(\\.exe\\)?\\] [[:digit:]]+\n"))) |