aboutsummaryrefslogtreecommitdiff
path: root/build2/test/rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-10-15 12:07:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:21 +0200
commit32e60fc5d4e771c5776ddb6715db10e5de182f28 (patch)
treeb91406238fd6cb1f3d727a5e4765e9affce44fb9 /build2/test/rule.cxx
parent75665dbe87b97c965eeb5f32b86f526ea8726436 (diff)
Pass test script to parser
Diffstat (limited to 'build2/test/rule.cxx')
-rw-r--r--build2/test/rule.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index f48a3d1..dd1e029 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -13,6 +13,7 @@
#include <build2/test/script/parser>
#include <build2/test/script/runner>
+#include <build2/test/script/script>
using namespace std;
using namespace butl;
@@ -308,6 +309,7 @@ namespace build2
perform_script (action, target& t)
{
using namespace script;
+ using script::script;
for (target* pt: t.prerequisite_targets)
{
@@ -319,11 +321,12 @@ namespace build2
try
{
+ script s (t, st);
+ concurrent_runner r;
+
ifdstream ifs (sp);
parser p;
- concurrent_runner run;
-
- p.parse (ifs, sp, t, st, run);
+ p.parse (ifs, sp, s, r);
}
catch (const io_error& e)
{