diff options
Diffstat (limited to 'libbuild2/test/operation.cxx')
| -rw-r--r-- | libbuild2/test/operation.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libbuild2/test/operation.cxx b/libbuild2/test/operation.cxx index b7ec357..2535adb 100644 --- a/libbuild2/test/operation.cxx +++ b/libbuild2/test/operation.cxx @@ -17,14 +17,8 @@ namespace build2 namespace test { static operation_id - test_pre (context&, - const values& params, - meta_operation_id mo, - const location& l) + pre_test (context&, const values&, meta_operation_id mo, const location&) { - if (!params.empty ()) - fail (l) << "unexpected parameters for operation test"; - // Run update as a pre-operation, unless we are disfiguring. // return mo != disfigure_id ? update_id : 0; @@ -65,13 +59,14 @@ namespace build2 0, "test", "test", - "test", "testing", "tested", "has nothing to test", // We cannot "be tested". execution_mode::first, 1 /* concurrency */, - &test_pre, + &pre_test, + nullptr, + nullptr, nullptr, nullptr, &adhoc_apply @@ -83,7 +78,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, @@ -92,6 +86,8 @@ namespace build2 op_update.concurrency, op_update.pre_operation, op_update.post_operation, + op_update.operation_pre, + op_update.operation_post, op_update.adhoc_match, op_update.adhoc_apply }; |