From 0b91535f7ba49b4e864aa735c8a83ee73b5de118 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Thu, 24 Feb 2022 16:57:44 -0800 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. --- 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 e19eaf9779..8cd893ce57 100644 --- a/test/lisp/eshell/esh-proc-tests.el +++ b/test/lisp/eshell/esh-proc-tests.el @@ -57,10 +57,11 @@ esh-proc-test/kill-pipeline (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.25.1