From 3ba17db6300d7e0cfc4fa001b5a8eb91bf417ea3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 12 Oct 2022 08:31:54 +0200 Subject: Switch to public/private variables model Now unqualified variables are project-private and can be typified. --- libbuild2/test/init.cxx | 10 +++++----- libbuild2/test/operation.cxx | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'libbuild2/test') diff --git a/libbuild2/test/init.cxx b/libbuild2/test/init.cxx index c80d3f0..f62ddcc 100644 --- a/libbuild2/test/init.cxx +++ b/libbuild2/test/init.cxx @@ -30,11 +30,6 @@ 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. // @@ -128,6 +123,11 @@ namespace build2 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))); } diff --git a/libbuild2/test/operation.cxx b/libbuild2/test/operation.cxx index b7ec357..841abb5 100644 --- a/libbuild2/test/operation.cxx +++ b/libbuild2/test/operation.cxx @@ -65,7 +65,6 @@ namespace build2 0, "test", "test", - "test", "testing", "tested", "has nothing to test", // We cannot "be tested". @@ -83,7 +82,6 @@ namespace build2 update_id, // Note: not update_for_test_id. test_id, op_update.name, - op_update.var_name, op_update.name_do, op_update.name_doing, op_update.name_did, -- cgit v1.1