aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build2/test/rule.cxx2
-rw-r--r--build2/test/script/runner2
-rw-r--r--build2/test/script/runner.cxx8
3 files changed, 6 insertions, 6 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index e8a31cb..0abc233 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -427,7 +427,7 @@ namespace build2
script::script s (t, ts, wd);
p.pre_parse (s);
- script::concurrent_runner r;
+ script::default_runner r;
p.execute (s, r);
};
diff --git a/build2/test/script/runner b/build2/test/script/runner
index 266835d..b82f771 100644
--- a/build2/test/script/runner
+++ b/build2/test/script/runner
@@ -46,7 +46,7 @@ namespace build2
leave (scope&, const location&) = 0;
};
- class concurrent_runner: public runner
+ class default_runner: public runner
{
public:
virtual void
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 3c646c7..67d82c0 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -178,7 +178,7 @@ namespace build2
}
}
- void concurrent_runner::
+ void default_runner::
enter (scope& sp, const location&)
{
if (!exists (sp.wd_path))
@@ -203,7 +203,7 @@ namespace build2
sp.clean ({cleanup_type::always, sp.wd_path}, true);
}
- void concurrent_runner::
+ void default_runner::
leave (scope& sp, const location& ll)
{
// Remove files and directories in the order opposite to the order of
@@ -289,7 +289,7 @@ namespace build2
: sp.wd_path.directory ());
}
- void concurrent_runner::
+ void default_runner::
run (scope& sp, const command_expr& expr, size_t li, const location& ll)
{
const command& c (expr.back ().pipe.back ()); // @@ TMP
@@ -730,7 +730,7 @@ namespace build2
check_output (p, esp, isp, c.err, ll, sp, "stderr");
}
- bool concurrent_runner::
+ bool default_runner::
run_if (scope&, const command_expr& expr, size_t, const location&)
{
const command& c (expr.back ().pipe.back ()); // @@ TMP