From fea10a1585b1aed8f502c609bd8c7cb563486f64 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Wed, 6 Sep 2023 17:01:06 -0700 Subject: [PATCH 5/5] Wait for all processes in a pipeline before resuming an Eshell command Previously, we only waited until the tail process was finished, but now, we wait for all of them. This is more consistent with other shells, and prevents some cases of a process's output coming *after* we continued past its pipeline. * lisp/eshell/esh-cmd.el (eshell-resume-command): Simplify conditionals, and check that all the foreground processes are dead before resuming Eshell command. * test/lisp/eshell/esh-cmd-tests.el (esh-cmd-test/pipeline-wait/multi-proc): New test. --- lisp/eshell/esh-cmd.el | 18 +++++++++++------- test/lisp/eshell/esh-cmd-tests.el | 10 ++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index a67b8abcc67..ca608e0e881 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -994,13 +994,17 @@ eshell-eval-command result))) (defun eshell-resume-command (proc status) - "Resume the current command when a process ends." - (when proc - (unless (or (not (stringp status)) - (string= "stopped" status) - (string-match eshell-reset-signals status)) - (if (eq proc (eshell-tail-process)) - (eshell-resume-eval))))) + "Resume the current command when a pipeline ends." + (when (and proc + ;; Make sure STATUS is something we want to handle. + (stringp status) + (not (string= "stopped" status)) + (not (string-match eshell-reset-signals status)) + ;; Make sure PROC is one of our foreground processes and + ;; that all of those processes are now dead. + (member proc eshell-last-async-procs) + (not (seq-some #'process-live-p eshell-last-async-procs))) + (eshell-resume-eval))) (defun eshell-resume-eval () "Destructively evaluate a form which may need to be deferred." diff --git a/test/lisp/eshell/esh-cmd-tests.el b/test/lisp/eshell/esh-cmd-tests.el index 3967910a53d..d625b8a6a5d 100644 --- a/test/lisp/eshell/esh-cmd-tests.el +++ b/test/lisp/eshell/esh-cmd-tests.el @@ -154,6 +154,16 @@ esh-cmd-test/pipeline-wait/tail-proc (eshell-match-command-output "*echo hi | echo bye" "bye\nhi\n"))) +(ert-deftest esh-cmd-test/pipeline-wait/multi-proc () + "Check that a pipeline waits for all its processes before returning." + (skip-unless (and (executable-find "echo") + (executable-find "sh") + (executable-find "rev"))) + (with-temp-eshell + (eshell-match-command-output + "*echo hello | sh -c 'sleep 1; rev' 1>&2 | *echo goodbye" + "goodbye\nolleh\n"))) + (ert-deftest esh-cmd-test/pipeline-wait/subcommand () "Check that piping with an asynchronous subcommand waits for the subcommand." (skip-unless (and (executable-find "echo") -- 2.25.1