Fix runner output in verbose (-v, -V) modes

3 files changed, 24 insertions, 18 deletions

diff --git a/tests/test/script/builtin/cat.test b/tests/test/script/builtin/cat.test
index 33515bc..0105e7c 100644
--- a/tests/test/script/builtin/cat.test
+++ b/tests/test/script/builtin/cat.test
@@ -71,12 +71,14 @@ EOI
 
 : big
 :
-: Cat a big file (about 3MB) to test that the builtin is asynchronous.
+: Cat a big file (about 100K) to test that the builtin is asynchronous.
 :
 {
-  s="------------------------------------------------------------------------"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  $c <"cat <'$s' | cat >'$s'" && $b
+  $c <<EOI && $b
+  s="--------------------------------"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  cat <"$s" | cat >"$s"
+  EOI
 }
diff --git a/tests/test/script/builtin/echo.test b/tests/test/script/builtin/echo.test
index 9e49a91..ac245c4 100644
--- a/tests/test/script/builtin/echo.test
+++ b/tests/test/script/builtin/echo.test
@@ -14,12 +14,14 @@ $c <'echo foo bar >"foo bar"' && $b
 
 : big
 :
-: Echo a big string (about 3MB) to test that the builtin is asynchronous.
+: Echo a big string (about 100K) to test that the builtin is asynchronous.
 :
 {
-  s="------------------------------------------------------------------------"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  $c <"echo '$s' | cat >'$s'" && $b
+  $c <<EOI && $b
+  s="--------------------------------"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  echo "$s" | cat >"$s"
+  EOI
 }
diff --git a/tests/test/script/builtin/sed.test b/tests/test/script/builtin/sed.test
index ef99539..c0a8172 100644
--- a/tests/test/script/builtin/sed.test
+++ b/tests/test/script/builtin/sed.test
@@ -301,12 +301,14 @@
 
 : big
 :
-: Sed a big file (about 3MB) to test that the builtin is asynchronous.
+: Sed a big file (about 100K) to test that the builtin is asynchronous.
 :
 {
-  s="------------------------------------------------------------------------"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
-  $c <"cat <'$s' | sed -e 's/^x//' >'$s'" && $b
+  $c <<EOI && $b
+  s="--------------------------------"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
+  cat <"$s" | sed -e 's/^x//' | cat >"$s"
+  EOI
 }