aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/test/script
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-12-09 15:10:56 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-12-11 14:31:39 +0300
commit32f153664e7b6cadfb518b83e12b9768a150d709 (patch)
tree706d683404d412e29e4cbd4640ce8b2780689c65 /libbuild2/test/script
parentec16a07c4bc3f3552ba5b4d09d3c5c375fb19e35 (diff)
Prefix pseudo-builtin diagnostincs messages with their names
Diffstat (limited to 'libbuild2/test/script')
-rw-r--r--libbuild2/test/script/script.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/libbuild2/test/script/script.cxx b/libbuild2/test/script/script.cxx
index cb367bc..b539c71 100644
--- a/libbuild2/test/script/script.cxx
+++ b/libbuild2/test/script/script.cxx
@@ -480,6 +480,7 @@ namespace build2
: "testscript timeout");
const char* tt ("test timeout");
+ const char* pf ("timeout: ");
size_t p (t.find ('/'));
if (p != string::npos)
@@ -491,15 +492,17 @@ namespace build2
if (p != 0)
group_deadline =
- to_deadline (parse_deadline (string (t, 0, p), gt, l),
+ to_deadline (parse_deadline (string (t, 0, p), gt, pf, l),
success);
if (p != t.size () - 1)
test_timeout =
- to_timeout (parse_timeout (string (t, p + 1), tt, l), success);
+ to_timeout (parse_timeout (string (t, p + 1), tt, pf, l),
+ success);
}
else
- group_deadline = to_deadline (parse_deadline (t, gt, l), success);
+ group_deadline = to_deadline (parse_deadline (t, gt, pf, l),
+ success);
}
optional<deadline> group::
@@ -516,8 +519,9 @@ namespace build2
set_timeout (const string& t, bool success, const location& l)
{
fragment_deadline =
- to_deadline (parse_deadline (t, "test fragment timeout", l),
- success);
+ to_deadline (
+ parse_deadline (t, "test fragment timeout", "timeout: ", l),
+ success);
}
optional<deadline> test::