From: Jim Porter <jporterbugs@gmail.com>
Date: Fri, 25 Feb 2022 02:18:27 +0000 (+0100)
Subject: Fix Eshell process tests to (hopefully) work on all platforms
X-Git-Tag: emacs-29.0.90~2114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73e1be36e513ac7ea56e1435f8242d83ec39e3b3;p=emacs.git

Fix Eshell process tests to (hopefully) work on all platforms

* test/lisp/eshell/esh-proc-tests.el (esh-proc-test/kill-pipeline):
Fix test (bug#54136).
---

diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el
index e19eaf9779b..8cd893ce570 100644
--- a/test/lisp/eshell/esh-proc-tests.el
+++ b/test/lisp/eshell/esh-proc-tests.el
@@ -57,10 +57,11 @@ prompt.  See bug#54136."
    (let ((output-start (eshell-beginning-of-output)))
      (eshell-kill-process)
      (eshell-wait-for-subprocess t)
-     (should (equal (buffer-substring-no-properties
-                     output-start (eshell-end-of-output))
-                    ;; "interrupt\n" is for MS-Windows.
-                    (or "interrupt\n" "killed\n"))))))
+     (should (string-match-p
+              ;; "interrupt\n" is for MS-Windows.
+              (rx (or "interrupt\n" "killed\n"))
+              (buffer-substring-no-properties
+               output-start (eshell-end-of-output)))))))
 
 (ert-deftest esh-proc-test/kill-pipeline-head ()
   "Test that killing the first process in a pipeline doesn't