]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix esh-proc-tests on MS-Windows
authorEli Zaretskii <eliz@gnu.org>
Thu, 24 Feb 2022 20:02:28 +0000 (22:02 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 24 Feb 2022 20:02:28 +0000 (22:02 +0200)
* 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

index a8be0f8030ba63f48b293f496404158558554261..e19eaf9779ba52bedf972d8b0d0228299d1b8a9a 100644 (file)
@@ -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")))