diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-27 08:29:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-27 08:29:52 +0200 |
| commit | c2001eb367b9b82e26689cad6f1f74f46c72b904 (patch) | |
| tree | db2ee46fc11989d85201ccebaf44f51b978fb313 /build2/test | |
| parent | 530e19cc8f53f066039967c41bb432111ce98626 (diff) | |
Pass target to prerequisite search
Diffstat (limited to 'build2/test')
| -rw-r--r-- | build2/test/rule.cxx | 6 | ||||
| -rw-r--r-- | build2/test/target.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 171cbac..64292fc 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -227,7 +227,7 @@ namespace build2 group_prerequisite_members (a, t, members_mode::maybe)) { if (p.is_a<testscript> ()) - t.prerequisite_targets.push_back (&p.search ()); + t.prerequisite_targets.push_back (&p.search (t)); } return [this] (action a, const target& t) @@ -289,9 +289,9 @@ namespace build2 // @@ OUT: what if this is a @-qualified pair or names? // - const target* it (in != nullptr ? &search (*in, bs) : nullptr); + const target* it (in != nullptr ? &search (t, *in, bs) : nullptr); const target* ot (on != nullptr - ? in == on ? it : &search (*on, bs) + ? in == on ? it : &search (t, *on, bs) : nullptr); if (a.operation () == update_id) diff --git a/build2/test/target.cxx b/build2/test/target.cxx index b6f9854..fd432fd 100644 --- a/build2/test/target.cxx +++ b/build2/test/target.cxx @@ -64,7 +64,7 @@ namespace build2 &testscript_target_extension, &testscript_target_pattern, nullptr, - &search_file, + &file_search, false }; } |