1 files changed, 64 insertions, 19 deletions

diff --git a/tests/dependency/recipe/testscript b/tests/dependency/recipe/testscript
index 09a38ad..a581724 100644
--- a/tests/dependency/recipe/testscript
+++ b/tests/dependency/recipe/testscript
@@ -406,7 +406,7 @@ alias{x}:
   echo
 }
 EOI
-<stdin>:3:1: error: expected recipe block instead of '{'
+<stdin>:3:1: error: expected recipe block or 'recipe' instead of '{'
 EOE
 
 : duplicate-action-single
@@ -418,7 +418,7 @@ alias{x}:
   echo
 }}
 EOI
-<stdin>:2:3: error: duplicate recipe for perform(update)
+<stdin>:2:3: error: duplicate perform(update) recipe
 EOE
 
 : duplicate-action-multiple
@@ -433,7 +433,25 @@ alias{x}:
   echo
 }}
 EOI
-<stdin>:5:3: error: duplicate recipe for perform(update)
+<stdin>:5:3: error: duplicate perform(update) recipe
+EOE
+
+: duplicate-action-multipe-decls
+:
+$* <<EOI 2>>EOE != 0
+alias{y}:
+{{
+  echo
+}}
+
+alias{x y}:
+% perform(update)
+{{
+  diag echo
+  echo
+}}
+EOI
+<stdin>:7:3: error: duplicate perform(update) recipe for target alias{y}
 EOE
 
 : if-else
@@ -593,18 +611,42 @@ EOE
   {
     : weight-0
     :
-    $* <<EOI 2>>EOE != 0
-      alias{x}:
-      {{
-
-        exit
-      }}
-      dump alias{x}
-      EOI
-      <stdin>:3:1: error: unable to deduce low-verbosity script diagnostics name
-        info: consider specifying it explicitly with the 'diag' recipe attribute
-        info: or provide custom low-verbosity diagnostics with the 'diag' builtin
-      EOE
+    {
+      : single-operation
+      :
+      {
+        $* <<EOI 2>>~%EOE%
+          alias{x}:
+          {{
+
+            exit
+          }}
+          dump alias{x}
+          EOI
+          %.{2}
+            % [diag=update] perform(update)
+          %.{3}
+          EOE
+      }
+
+      : multiple-operations
+      :
+      {
+        $* <<EOI 2>>EOE != 0
+          alias{x}:
+          % update clean
+          {{
+
+            exit
+          }}
+          dump alias{x}
+          EOI
+          <stdin>:4:1: error: unable to deduce low-verbosity script diagnostics name
+            info: consider specifying it explicitly with the 'diag' recipe attribute
+            info: or provide custom low-verbosity diagnostics with the 'diag' builtin
+          EOE
+      }
+    }
 
     : weight-1
     :
@@ -657,7 +699,7 @@ EOE
   : process-path-ex
   :
   {
-    config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
+    config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode)
 
     mkdir build;
     cat <<EOI >=build/bootstrap.build;
@@ -673,7 +715,7 @@ EOE
       EOI
 
     $* $config_cxx <<EOI 2>>~%EOE%
-      c = $cxx.path --version
+      c = [cmdline] $cxx.path --version
       alias{x}:
       {{
         $c
@@ -711,7 +753,7 @@ EOE
     $* <<EOI 2>>EOE != 0
       alias{x}:
       {{
-        foo = bar
+        foo = [cmdline] bar
         $foo
       }}
       dump alias{x}
@@ -827,8 +869,11 @@ EOE
       %  .+alias\{x\}:%
         % perform(update)
         {{
+          rm a
+          echo b | set c
           diag bar
-      %.{4}
+          fo$v
+        }}
       EOE
   }
 }