1 files changed, 25 insertions, 19 deletions

diff --git a/libbuild2/test/init.cxx b/libbuild2/test/init.cxx
index 539cdec..32548f4 100644
--- a/libbuild2/test/init.cxx
+++ b/libbuild2/test/init.cxx
@@ -23,6 +23,8 @@ namespace build2
 {
   namespace test
   {
+    static const file_rule file_rule_ (true /* check_type */);
+
     void
     boot (scope& rs, const location&, module_boot_extra& extra)
     {
@@ -30,15 +32,14 @@ namespace build2
 
       l5 ([&]{trace << "for " << rs;});
 
-      // Register our operations.
-      //
-      rs.insert_operation (test_id, op_test);
-      rs.insert_operation (update_for_test_id, op_update_for_test);
-
       // Enter module variables. Do it during boot in case they get assigned
       // in bootstrap.build.
       //
-      auto& vp (rs.var_pool ());
+      // Most of the variables we enter are qualified so go straight for the
+      // public variable pool.
+      //
+      auto& vp (rs.var_pool (true /* public */));
+      auto& pvp (rs.var_pool ()); // For `test` and `for_test`.
 
       common_data d {
 
@@ -69,7 +70,7 @@ namespace build2
         // The test variable is a name which can be a path (with the
         // true/false special values) or a target name.
         //
-        vp.insert<name>    ("test", variable_visibility::target),
+        pvp.insert<name>   ("test", variable_visibility::target),
         vp.insert<strings> ("test.options"),
         vp.insert<strings> ("test.arguments"),
 
@@ -111,12 +112,12 @@ namespace build2
 
       // This one is used by other modules/rules.
       //
-      vp.insert<bool> ("for_test", variable_visibility::prereq);
+      pvp.insert<bool> ("for_test", variable_visibility::prereq);
 
       // These are only used in testscript.
       //
-      vp.insert<strings> ("test.redirects");
-      vp.insert<strings> ("test.cleanups");
+      vp.insert<cmdline> ("test.redirects");
+      vp.insert<cmdline> ("test.cleanups");
 
       // Unless already set, default test.target to build.host. Note that it
       // can still be overriden by the user, e.g., in root.build.
@@ -125,9 +126,14 @@ namespace build2
         value& v (rs.assign (d.test_target));
 
         if (!v || v.empty ())
-          v = cast<target_triplet> (rs.ctx.global_scope["build.host"]);
+          v = *rs.ctx.build_host;
       }
 
+      // Register our operations.
+      //
+      rs.insert_operation (test_id,            op_test,            &d.var_test);
+      rs.insert_operation (update_for_test_id, op_update_for_test, &d.var_test);
+
       extra.set_module (new module (move (d)));
     }
 
@@ -296,18 +302,18 @@ namespace build2
       {
         default_rule& dr (m);
 
-        // Note: register for mtime_target to take priority over the fallback
-        // rule below.
-        //
-        rs.insert_rule<target>       (perform_test_id, "test", dr);
-        rs.insert_rule<mtime_target> (perform_test_id, "test", dr);
-        rs.insert_rule<alias>        (perform_test_id, "test", dr);
+        rs.insert_rule<target> (perform_test_id, "test", dr);
+        rs.insert_rule<alias>  (perform_test_id, "test", dr);
 
         // Register the fallback file rule for the update-for-test operation,
         // similar to update.
         //
-        rs.global_scope ().insert_rule<mtime_target> (
-          perform_test_id, "test.file", file_rule::instance);
+        // Note: use target instead of anything more specific (such as
+        // mtime_target) in order not to take precedence over the "test" rule
+        // above.
+        //
+        rs.global_scope ().insert_rule<target> (
+          perform_test_id, "test.file", file_rule_);
       }
 
       return true;