1 files changed, 210 insertions, 15 deletions

diff --git a/tests/test/script/runner/set.testscript b/tests/test/script/runner/set.testscript
index b2944a3..1800a7d 100644
--- a/tests/test/script/runner/set.testscript
+++ b/tests/test/script/runner/set.testscript
@@ -76,7 +76,7 @@
 
   : empty-attrs
   :
-  $c <"set '' baz" && $b 2>>EOE != 0
+  $c <"set baz ''" && $b 2>>EOE != 0
   testscript:1:1: error: set: empty variable attributes
     info: test id: 1
   EOE
@@ -300,7 +300,7 @@
   $c <<EOI && $b 2>>~%EOE% != 0
   $* -o 'foo' -l 10 | env -t 1 -- set bar
   EOI
-  %testscript:.*: error: set terminated: execution timeout expired%
+  %testscript:.*: error: .+driver.* terminated: execution timeout expired%
   %.
   EOE
 
@@ -326,23 +326,218 @@
     echo "$s" >=f;
     $* -o 'foo' -l 10 | cat f - | env -t 2 -- set bar
     EOI
-    %testscript:.*: error: set terminated: execution timeout expired%
+    %testscript:.*: error: process .+driver.* terminated: execution timeout expired%
+    %.
+    %testscript:.*: error: builtin cat terminated: execution timeout expired%
     %.
     EOE
 
     : success
     :
-    : Note that the cat builtin ends up with the 'broken pipe' diagnostics or
-    : similar.
-    :
     $c <<EOI && $b
     echo "$s" >=f;
     timeout --success 2;
-    $* -o 'foo' -l 10 | cat f - 2>>~%EOE% | set bar
-      %cat: .+%
-      EOE
+
+    # Suppress cat's 'broken pipe' diagnostics.
+    #
+    $* -o 'foo' -l 10 | cat f - 2>- | set bar
     EOI
   }
+
+  : split
+  :
+  : Test various splitting modes as above, but now reading the stream in the
+  : non-blocking mode.
+  :
+  {
+    : whitespace-separated-list
+    :
+    {
+      : non-exact
+      :
+      {
+        : non-empty
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -w baz <' foo   bar ';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'"foo" "bar"'
+        EOI
+
+        : empty
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -w baz <:'';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >''
+        EOI
+
+        : spaces
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -w baz <'  ';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >''
+        EOI
+      }
+
+      : exact
+      :
+      {
+        : trailing-ws
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set --exact --whitespace baz <' foo   bar ';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'"foo" "bar" ""'
+        EOI
+
+        : no-trailing-ws
+        :
+        : Note that we need to strip the default trailing newline as well with the
+        : ':' modifier.
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -e -w baz <:' foo bar';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'"foo" "bar"'
+        EOI
+
+        : empty
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -e -w baz <:'';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >''
+        EOI
+
+        : spaces
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -e -w baz <'  ';
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'""'
+        EOI
+      }
+    }
+
+    : newline-separated-list
+    :
+    {
+      : non-exact
+      :
+      $c <<EOI && $b
+      timeout 10;
+      set -n baz <<EOF;
+
+      foo
+
+      bar
+
+      EOF
+      echo $regex.apply($baz, '^(.*)$', '"\1"') >'"" "foo" "" "bar" ""'
+      EOI
+
+      : exact
+      :
+      {
+        : trailing-newline
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set --exact --newline baz <<EOF;
+
+        foo
+
+        bar
+
+        EOF
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'"" "foo" "" "bar" "" ""'
+        EOI
+
+        : no-trailing-newline
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set --exact --newline baz <<:EOF;
+
+        foo
+
+        bar
+        EOF
+        echo $regex.apply($baz, '^(.*)$', '"\1"') >'"" "foo" "" "bar"'
+        EOI
+      }
+    }
+
+    : string
+    :
+    {
+      : non-exact
+      :
+      $c <<EOI && $b
+      timeout 10;
+      set baz <<EOF;
+
+      foo
+
+      bar
+
+      EOF
+      echo ($baz[0]) >>EOO
+
+      foo
+
+      bar
+
+      EOO
+      EOI
+
+      : exact
+      :
+      : Note that echo adds the trailing newline, so EOF and EOO here-documents
+      : differ by this newline.
+      :
+      {
+        : trailing-newline
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -e baz <<EOF;
+
+        foo
+
+        bar
+        EOF
+        echo ($baz[0]) >>EOO
+
+        foo
+
+        bar
+
+        EOO
+        EOI
+
+        : no-trailing-newline
+        :
+        $c <<EOI && $b
+        timeout 10;
+        set -e baz <<:EOF;
+
+        foo
+
+        bar
+        EOF
+        echo ($baz[0]) >>EOO
+
+        foo
+
+        bar
+        EOO
+        EOI
+      }
+    }
+  }
 }
 
 : attributes
@@ -351,14 +546,14 @@
   : dir_path
   :
   $c <<EOI && $b
-  set [dir_path] bar <'foo';
+  set bar [dir_path] <'foo';
   echo $bar >/'foo/'
   EOI
 
   : null
   :
   $c <<EOI && $b
-  set [null] foo <-;
+  set foo [null] <-;
   echo $foo >''
   EOI
 
@@ -376,7 +571,7 @@
   : empty-brackets
   :
   $c <<EOI && $b 2>>EOE != 0
-  set -w '[]' baz <'foo bar';
+  set -w baz '[]' <'foo bar';
   echo "$baz"
   EOI
   testscript:2:8: error: concatenating variable expansion contains multiple values
@@ -385,7 +580,7 @@
   : no-left-bracket
   :
   $c <<EOI && $b 2>>EOE != 0
-  set -w x baz
+  set -w baz x
   EOI
   <attributes>:1:1: error: expected '[' instead of 'x'
     testscript:1:1: info: while parsing attributes 'x'
@@ -395,7 +590,7 @@
   : unknown
   :
   $c <<EOI && $b 2>>EOE != 0
-  set -w [x] baz
+  set -w baz [x]
   EOI
   <attributes>:1:1: error: unknown value attribute x
     testscript:1:1: info: while parsing attributes '[x]'
@@ -405,7 +600,7 @@
   : junk
   :
   $c <<EOI && $b 2>>EOE != 0
-  set -w '[string] x' baz
+  set -w baz '[string] x'
   EOI
   <attributes>:1:10: error: trailing junk after ']'
     testscript:1:1: info: while parsing attributes '[string] x'