diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-10-14 15:01:05 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:14 +0200 |
| commit | 68cfa29aeecc32ee0623aa008fd0e73899e10c9a (patch) | |
| tree | 8a6ae9a289e5cad5d94f0810be493d24bf9203c4 /build2/test/script | |
| parent | 7fb96a64584a357d871b1ae3abde0a48ad60ea92 (diff) | |
Extend test rule to handle testscripts
Diffstat (limited to 'build2/test/script')
| -rw-r--r-- | build2/test/script/parser.cxx | 6 | ||||
| -rw-r--r-- | build2/test/script/runner.cxx | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx index 601cbd4..f067e84 100644 --- a/build2/test/script/parser.cxx +++ b/build2/test/script/parser.cxx @@ -197,7 +197,7 @@ namespace build2 // Make sure we don't have any pending positions to fill. // - auto check_pending = [p, this] (const location& l) + auto check_pending = [&p, this] (const location& l) { const char* what (nullptr); @@ -448,7 +448,7 @@ namespace build2 case type::newline: { done = true; - break; + continue; } default: { @@ -520,6 +520,8 @@ namespace build2 expire_mode (); } + else + next (t, tt); // Now that we have all the pieces, run the test. // diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index 3789281..69b0213 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -13,9 +13,10 @@ namespace build2 namespace script { void concurrent_runner:: - run (const test&) + run (const test& t) { - assert (false); // @@ TODO + // @@ TODO + text << "run " << t.program; } } } |