From 8d2fbd4a146bcd01fd905fb500230c7c662f2a01 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 24 Feb 2022 22:02:28 +0200 Subject: [PATCH] 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 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." (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"))) -- 2.39.5