From 52a29dd64479e9313848941078a2619b47f2c61b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 8 Mar 2017 00:39:30 +0300
Subject: Add support for config.test.output variable

---
 unit-tests/test/script/parser/command-if.test | 4 ++--
 unit-tests/test/script/parser/driver.cxx      | 4 ++--
 unit-tests/test/script/parser/scope-if.test   | 4 ++--
 unit-tests/test/script/parser/scope.test      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'unit-tests/test/script/parser')

diff --git a/unit-tests/test/script/parser/command-if.test b/unit-tests/test/script/parser/command-if.test
index ffe2c35..29d1dce 100644
--- a/unit-tests/test/script/parser/command-if.test
+++ b/unit-tests/test/script/parser/command-if.test
@@ -89,7 +89,7 @@
   EOI
   {
     ? true
-    cmd
+    +cmd
   }
   EOO
 
@@ -102,7 +102,7 @@
   EOI
   {
     ? true
-    cmd
+    -cmd
   }
   EOO
 }
diff --git a/unit-tests/test/script/parser/driver.cxx b/unit-tests/test/script/parser/driver.cxx
index 5872fb8..772bc10 100644
--- a/unit-tests/test/script/parser/driver.cxx
+++ b/unit-tests/test/script/parser/driver.cxx
@@ -90,11 +90,11 @@ namespace build2
 
         virtual void
         run (scope&,
-             const command_expr& e,
+             const command_expr& e, command_type t,
              size_t i,
              const location&) override
         {
-          cout << ind_ << e;
+          cout << ind_ << t << e;
 
           if (line_)
             cout << " # " << i;
diff --git a/unit-tests/test/script/parser/scope-if.test b/unit-tests/test/script/parser/scope-if.test
index 4f524cf..2867107 100644
--- a/unit-tests/test/script/parser/scope-if.test
+++ b/unit-tests/test/script/parser/scope-if.test
@@ -489,7 +489,7 @@ else
 -tdown          # 8
 EOI
 {
-  setup # 1
+  +setup # 1
   ? false one # 2
   ? false two # 3
   ? true # 4
@@ -501,7 +501,7 @@ EOI
   {
     cmd2 # 0
   }
-  tdown # 8
+  -tdown # 8
 }
 EOO
 
diff --git a/unit-tests/test/script/parser/scope.test b/unit-tests/test/script/parser/scope.test
index 144dc54..437a3dc 100644
--- a/unit-tests/test/script/parser/scope.test
+++ b/unit-tests/test/script/parser/scope.test
@@ -115,7 +115,7 @@ $* foo.test <'cmd "$~"' >~"%cmd '?.+[/\\\\]test-driver[/\\\\]foo[/\\\\]1'?%"
     EOI
     {
       { # 1
-        setup
+        +setup
         { # 1/4
           cmd abc
         }
-- 
cgit v1.1