From 9d9fb20afaf62ae87a8f8253b8614aeacab0ce44 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 21 Jun 2019 13:46:55 +0200
Subject: [PATCH] Fix tesh test and distcheck.

---
 tools/tesh/CMakeLists.txt           |  3 ++-
 tools/tesh/catch-all-bg-output.tesh | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt
index 5390d9c902..77e6bf9cb6 100644
--- a/tools/tesh/CMakeLists.txt
+++ b/tools/tesh/CMakeLists.txt
@@ -3,7 +3,8 @@ configure_file("${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.py"
 
 
 foreach(x setenv set-output-ignore set-output-sort set-return set-timeout background basic bg-basic bg-set-signal
-          catch-return catch-signal catch-timeout catch-timeout-output catch-wrong-output cd color ignore-regexp IO-bigsize IO-broken-pipe IO-orders)
+          catch-all-bg-output catch-return catch-signal catch-timeout catch-timeout-output catch-wrong-output cd color
+          ignore-regexp IO-bigsize IO-broken-pipe IO-orders)
   set(tesh_files  ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
   if(NOT enable_memcheck AND NOT WIN32)
     ADD_TESH(tesh-self-${x} --setenv bindir=${CMAKE_BINARY_DIR}/bin ${CMAKE_HOME_DIRECTORY}/tools/tesh/${x}.tesh)
diff --git a/tools/tesh/catch-all-bg-output.tesh b/tools/tesh/catch-all-bg-output.tesh
index 5bf770454b..e0ba89a9ab 100644
--- a/tools/tesh/catch-all-bg-output.tesh
+++ b/tools/tesh/catch-all-bg-output.tesh
@@ -10,25 +10,28 @@
 < ! timeout 2
 < & sh -c 'echo "I also crash in background" && sleep 1'
 < 
-< !timeout 1
+< ! timeout 1
 < $ sh -c 'echo "I crash in foreground"'
 $ ${bindir:=.}/tesh
-> Output of <meh.tesh:8> mismatch:
+> Test suite from stdin
+> [(stdin):8] sh -c 'echo "I crash in foreground"'
+> Output of <(stdin):8> mismatch:
 > --- expected
 > +++ obtained
 > @@ -0,0 +1 @@
 > +I crash in foreground
-> Test suite `meh.tesh': NOK (<meh.tesh:8> output mismatch)
-> Output of <meh.tesh:5> mismatch:
+> Test suite `(stdin)': NOK (<(stdin):8> output mismatch)
+> [(stdin):5] sh -c 'echo "I also crash in background" && sleep 1'
+> Output of <(stdin):5> mismatch:
 > --- expected
 > +++ obtained
 > @@ -0,0 +1 @@
 > +I also crash in background
-> Test suite `meh.tesh': NOK (<meh.tesh:5> output mismatch)
-> Test suite `meh.tesh': NOK (<meh.tesh:2> timeout after 4 sec)
-> Output of <meh.tesh:2> mismatch:
+> Test suite `(stdin)': NOK (<(stdin):5> output mismatch)
+> [(stdin):2] sh -c 'echo "I crash in background" && sleep 2'
+> Output of <(stdin):2> mismatch:
 > --- expected
 > +++ obtained
 > @@ -0,0 +1 @@
 > +I crash in background
-> Test suite `meh.tesh': NOK (<meh.tesh:2> output mismatch)
+> Test suite `(stdin)': NOK (<(stdin):2> output mismatch)
-- 
2.20.1