[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8d2fbd4a14: Fix esh-proc-tests on MS-Windows
From: |
Eli Zaretskii |
Subject: |
master 8d2fbd4a14: Fix esh-proc-tests on MS-Windows |
Date: |
Thu, 24 Feb 2022 15:02:59 -0500 (EST) |
branch: master
commit 8d2fbd4a146bcd01fd905fb500230c7c662f2a01
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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.
---
test/lisp/eshell/esh-proc-tests.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/lisp/eshell/esh-proc-tests.el
b/test/lisp/eshell/esh-proc-tests.el
index a8be0f8030..e19eaf9779 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."
(eshell-wait-for-subprocess t)
(should (equal (buffer-substring-no-properties
output-start (eshell-end-of-output))
- "killed\n")))))
+ ;; "interrupt\n" is for MS-Windows.
+ (or "interrupt\n" "killed\n"))))))
(ert-deftest esh-proc-test/kill-pipeline-head ()
"Test that killing the first process in a pipeline doesn't
@@ -88,4 +89,4 @@ prompt. See bug#54136."
(kill-process (caar eshell-process-list))
;; Give `eshell-sentinel' a chance to run.
(sit-for 0.1)
- (eshell-match-result "\\[sh\\] [[:digit:]]+\n")))
+ (eshell-match-result "\\[sh\\(\\.exe\\)?\\] [[:digit:]]+\n")))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 8d2fbd4a14: Fix esh-proc-tests on MS-Windows,
Eli Zaretskii <=