diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2018-01-20 13:46:11 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-03 14:35:45 +0200 |
commit | 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee (patch) | |
tree | f35f106e5369e98350327c79080c571195234c0b /build2/test/script | |
parent | 280f4a5bf787587227ca193cd59c6bd74091db70 (diff) |
Get rid of action rule override semantics
Instead we now have two more or less separate match states for outer and
inner parts of an action.
Diffstat (limited to 'build2/test/script')
-rw-r--r-- | build2/test/script/runner.cxx | 4 | ||||
-rw-r--r-- | build2/test/script/script.cxx | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index cddd3a7..9588ac2 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -181,6 +181,8 @@ namespace build2 // For targets other than Windows leave the string intact. // + // @@ Would be nice to use cached value from test::common_data. + // if (cast<target_triplet> (scr.test_target["test.target"]).class_ != "windows") return s; @@ -294,6 +296,8 @@ namespace build2 // Ignore Windows newline fluff if that's what we are running on. // + // @@ Would be nice to use cached value from test::common_data. + // if (cast<target_triplet> ( sp.root->test_target["test.target"]).class_ == "windows") args.push_back ("--strip-trailing-cr"); diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx index 51c08cb..0516b0f 100644 --- a/build2/test/script/script.cxx +++ b/build2/test/script/script.cxx @@ -503,6 +503,8 @@ namespace build2 // buildfiles except for test: while in buildfiles it can be a // target name, in testscripts it should be resolved to a path. // + // Note: entering in a custom variable pool. + // test_var (var_pool.insert<path> ("test")), options_var (var_pool.insert<strings> ("test.options")), arguments_var (var_pool.insert<strings> ("test.arguments")), @@ -527,7 +529,9 @@ namespace build2 // script // script:: - script (const target& tt, const testscript& st, const dir_path& rwd) + script (const target& tt, + const testscript& st, + const dir_path& rwd) : group (st.name == "testscript" ? string () : st.name, this), test_target (tt), script_target (st) @@ -574,7 +578,7 @@ namespace build2 { // Must be a target name. // - // @@ OUT: what if this is a @-qualified pair or names? + // @@ OUT: what if this is a @-qualified pair of names? // t = search_existing (*n, tt.base_scope ()); |