aboutsummaryrefslogtreecommitdiff
path: root/build2/test
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-08-07 14:59:07 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-08-07 19:32:10 +0200
commitc2b4305349ca855c497904282db354de56c74842 (patch)
tree13ff2901d1ab491d930f81cee6fa49e5cff11577 /build2/test
parent7149c8eaeec3efcfc9da0f89c9ae979ff2c07fd5 (diff)
Add support for default extension specification, trailing dot escaping
For example: cxx{*}: extension = cxx cxx{foo} # foo.cxx cxx{foo.test} # foo.test (probably what we want...) cxx{foo.test...} # foo.test.cxx (... is this) cxx{foo..} # foo. cxx{foo....} # foo.. cxx{foo.....} # error (must come in escape pair)
Diffstat (limited to 'build2/test')
-rw-r--r--build2/test/target.cxx19
1 files changed, 12 insertions, 7 deletions
diff --git a/build2/test/target.cxx b/build2/test/target.cxx
index a517240..25afd0d 100644
--- a/build2/test/target.cxx
+++ b/build2/test/target.cxx
@@ -24,19 +24,24 @@ namespace build2
testscript_target_pattern (const target_type&,
const scope&,
string& v,
+ optional<string>& e,
+ const location& l,
bool r)
{
- size_t p (path::traits::find_extension (v));
-
if (r)
{
- assert (p != string::npos);
- v.resize (p);
+ assert (e);
+ e = nullopt;
}
- else if (p == string::npos && v != "testscript")
+ else
{
- v += ".test";
- return true;
+ e = target::split_name (v, l);
+
+ if (!e && v != "testscript")
+ {
+ e = "test";
+ return true;
+ }
}
return false;