From 1845141809aa91b03718066a6f46863885a6a887 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 7 Mar 2019 09:06:37 +0200
Subject: 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).
---
 build2/test/script/script.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/test/script/script.cxx')

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;
           }
-- 
cgit v1.1