Fix unexpected 'unterminated double-quoted sequence' script error

2 files changed, 65 insertions, 0 deletions

diff --git a/tests/recipe/buildscript/testscript b/tests/recipe/buildscript/testscript
index c473b0d..94eb665 100644
--- a/tests/recipe/buildscript/testscript
+++ b/tests/recipe/buildscript/testscript
@@ -1550,6 +1550,48 @@ if $posix
         $* clean 2>-
       }
 
+      : quoting
+      :
+      {
+        echo 'bar' >=bar;
+        echo 'baz' >=baz;
+
+        cat <<EOI >=buildfile;
+          foo: bar baz
+          {{
+            n = 'gen'
+            diag "($n)" ($>)
+
+            p = $path($>)
+            rm -f $p
+
+            o = -w
+            for "$o" f <<"EOF"
+            $path($<)
+            EOF
+              cat $f >>$p
+            end
+
+            o = -n
+            for "($o)" f <<"EOF"
+            $path($<)
+            EOF
+              echo $f >>$p
+            end
+          }}
+          EOI
+
+        $* 2>'gen file{foo.}';
+
+        cat <<<foo >>~%EOO%;
+          bar
+          baz
+          %.+bar .+baz%
+          EOO
+
+        $* clean 2>-
+      }
+
       : special-var
       :
       {
diff --git a/tests/test/script/runner/for.testscript b/tests/test/script/runner/for.testscript
index 85ea765..658ff49 100644
--- a/tests/test/script/runner/for.testscript
+++ b/tests/test/script/runner/for.testscript
@@ -268,6 +268,29 @@
     'b'
     EOO
 
+  : quoted-opt
+  :
+  $c <<EOI && $b >>EOO
+    o = -n
+    for "$o" x <<EOF
+      a
+      b
+      EOF
+      echo "'$x'" >|
+    end;
+    for "($o)" x <<EOF
+      c
+      d
+      EOF
+      echo "'$x'" >|
+    end
+    EOI
+    'a'
+    'b'
+    'c'
+    'd'
+    EOO
+
   : newline-split
   :
   $c <<EOI && $b >>EOO