3 files changed, 22 insertions, 6 deletions
diff --git a/tests/test/script/runner/pipe.testscript b/tests/test/script/runner/pipe.testscript
index 205fd55..92ab33e 100644
--- a/tests/test/script/runner/pipe.testscript
+++ b/tests/test/script/runner/pipe.testscript
@@ -17,7 +17,7 @@ $c <'$* -o foo | cat >foo' && $b     : process-to-builtin
   :
   $c <'$* -o foo -s 1 | $* -i 1 >foo -s 2' && $b 2>>/~%EOE% != 0
   %testscript:1:1: error: .+ exited with code 2%
-    info: stdout: test/1/stdout-2
+    info: stdout: test/1/stdout-c2
     info: test id: 1
   EOE
 
@@ -25,9 +25,9 @@ $c <'$* -o foo | cat >foo' && $b     : process-to-builtin
   :
   $c <'$* -o foo -e foo 2>bar | $* -i 2 2>baz' && $b 2>>/~%EOE% != 0
   %testscript:1:1: error: .+ stderr doesn't match expected%
-    info: stderr: test/1/stderr-2
-    info: expected stderr: test/1/stderr-2.orig
-    info: stderr diff: test/1/stderr-2.diff
+    info: stderr: test/1/stderr-c2
+    info: expected stderr: test/1/stderr-c2.orig
+    info: stderr diff: test/1/stderr-c2.diff
   %.{3}
   -baz
   +foo
diff --git a/tests/test/script/runner/redirect.testscript b/tests/test/script/runner/redirect.testscript
index 0fe3aa3..209c4ce 100644
--- a/tests/test/script/runner/redirect.testscript
+++ b/tests/test/script/runner/redirect.testscript
@@ -654,9 +654,9 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex.
     $* -o bar >?out
     EOI
     %testscript:2: error: ../../../../../driver(.exe)? stdout doesn't match expected%
-      info: stdout: test/1/stdout-2
+      info: stdout: test/1/stdout-n2
       info: expected stdout: test/1/out
-      info: stdout diff: test/1/stdout-2.diff
+      info: stdout diff: test/1/stdout-n2.diff
     %--- \.*%
     %\+\+\+ \.*%
     %@@ \.*%
diff --git a/tests/test/script/runner/while.testscript b/tests/test/script/runner/while.testscript
new file mode 100644
index 0000000..1c58827
--- /dev/null
+++ b/tests/test/script/runner/while.testscript
@@ -0,0 +1,16 @@
+# file      : tests/test/script/runner/while.testscript
+# license   : MIT; see accompanying LICENSE file
+
+.include ../common.testscript
+
+: basics
+:
+$c <<EOI && $b >>EOO
+  while ($v != "aa")
+    echo "$v" >|
+    v = "$(v)a"
+  end
+  EOI
+
+  a
+  EOO