Re: master updated (5af5ed6c62 -> f07505d1ec)

[Jim Porter <jporterbugs@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 925 bytes --]

On 9/6/2022 2:33 AM, Lars Ingebrigtsen wrote:
> Speaking of eshell tests -- this one seems to be failing on EMBA in
> nativecomp:
> 
> https://emba.gnu.org/emacs/emacs/-/jobs/53337
> 
> 1 unexpected results:
>     FAILED  eshell-test/subcommand-reset-in-pipeline  ((should (eshell-command-result--equal command (eshell-test-command-result command) result)) :form (eshell-command-result--equal "*cat $<echo $eshell-in-pipeline-p | echo> | *cat" "first\n" "first") :value nil :explanation (nonequal-result (command "*cat $<echo $eshell-in-pipeline-p | echo> | *cat") (result "first\n") (expected "first")))
> 
> I'm unable to reproduce the failure myself.

Interesting; the test is outputting "first\n", but we don't expect the 
newline. Maybe this is because EMBA uses a different version of "cat"?

I think something like the attached patch would fix things. Then the 
test won't care about whether there's a newline or not.

[-- Attachment #2: 0001-Improve-robustness-of-an-Eshell-regression-test.patch --]
[-- Type: text/plain, Size: 1971 bytes --]

From b23948f4645fa3db3d309e2f1197ff389264b97c Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Tue, 6 Sep 2022 11:36:58 -0700
Subject: [PATCH] Improve robustness of an Eshell regression test

* test/lisp/eshell/eshell-tests.el
(eshell-test/subcommand-reset-in-pipeline): Use
'eshell-match-command-output' to check result.

Ref: https://lists.gnu.org/archive/html/emacs-devel/2022-09/msg00314.html
---
 test/lisp/eshell/eshell-tests.el | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/lisp/eshell/eshell-tests.el b/test/lisp/eshell/eshell-tests.el
index d5112146c2..2dc996e923 100644
--- a/test/lisp/eshell/eshell-tests.el
+++ b/test/lisp/eshell/eshell-tests.el
@@ -83,18 +83,19 @@ eshell-test/subcommand-reset-in-pipeline
   (dolist (template '("echo {%s} | *cat"
                       "echo ${%s} | *cat"
                       "*cat $<%s> | *cat"))
-    (eshell-command-result-equal
-     (format template "echo $eshell-in-pipeline-p")
-     nil)
-    (eshell-command-result-equal
-     (format template "echo | echo $eshell-in-pipeline-p")
-     "last")
-    (eshell-command-result-equal
-     (format template "echo $eshell-in-pipeline-p | echo")
-     "first")
-    (eshell-command-result-equal
-     (format template "echo | echo $eshell-in-pipeline-p | echo")
-     "t")))
+    (with-temp-eshell
+     (eshell-match-command-output
+      (format template "echo $eshell-in-pipeline-p")
+      "\\`\\'")
+     (eshell-match-command-output
+      (format template "echo | echo $eshell-in-pipeline-p")
+      "\\`last")
+     (eshell-match-command-output
+      (format template "echo $eshell-in-pipeline-p | echo")
+      "\\`first")
+     (eshell-match-command-output
+      (format template "echo | echo $eshell-in-pipeline-p | echo")
+      "\\`t"))))
 
 (ert-deftest eshell-test/lisp-reset-in-pipeline ()
   "Check that interpolated Lisp forms reset `eshell-in-pipeline-p'."
-- 
2.25.1