From 73e1be36e513ac7ea56e1435f8242d83ec39e3b3 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Fri, 25 Feb 2022 03:18:27 +0100 Subject: [PATCH] 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). --- test/lisp/eshell/esh-proc-tests.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 -- 2.39.5