diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-03-07 09:06:37 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-03-07 09:06:37 +0200 |
| commit | 1845141809aa91b03718066a6f46863885a6a887 (patch) | |
| tree | a3f542ec7c1781e65aa16a9b0d5c31eae4c4d757 /build2/test/script/script.cxx | |
| parent | e0002617846755fb5f199f40a677e16d6f69e5ec (diff) | |
Add support for alternative build file/directory naming scheme
Now the build/*.build, buildfile, and .buildignore filesystem entries in
a project can alternatively (but consistently) be called build2/*.build2,
build2file, and .build2ignore. See a note at the beginning of the Project
Structure section in the manual for details (motivation, restrictions,
etc).
Diffstat (limited to 'build2/test/script/script.cxx')
| -rw-r--r-- | build2/test/script/script.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx index f2a8d03..94d6d8b 100644 --- a/build2/test/script/script.cxx +++ b/build2/test/script/script.cxx @@ -517,6 +517,7 @@ namespace build2 const dir_path& rwd) : group (st.name == "testscript" ? string () : st.name, this), test_target (tt), + target_scope (tt.base_scope ()), script_target (st) { // Set the script working dir ($~) to $out_base/test/<id> (id_path @@ -563,7 +564,7 @@ namespace build2 // // @@ OUT: what if this is a @-qualified pair of names? // - t = search_existing (*n, tt.base_scope ()); + t = search_existing (*n, target_scope); if (t == nullptr) fail << "unknown target '" << *n << "' in test variable"; @@ -653,8 +654,7 @@ namespace build2 if (p.first) { if (var.override != nullptr) - p = s.test_target.base_scope ().find_override ( - var, move (p), true); + p = s.target_scope.find_override (var, move (p), true); return p.first; } |