aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2016-06-03 21:17:57 +0300
committerHemmo Nieminen <hemmo.nieminen@iki.fi>2016-06-06 10:28:00 +0300
commitfac6f869e08c139d8d84cff56c479a10cad7ac8e (patch)
treebdb91ca54f11b27c1a131eda19a62d542a87737d
parent30bbcded235018bc7a353d67e93a5e5e5c7ec592 (diff)
downloadmeson-fac6f869e08c139d8d84cff56c479a10cad7ac8e.zip
meson-fac6f869e08c139d8d84cff56c479a10cad7ac8e.tar.gz
meson-fac6f869e08c139d8d84cff56c479a10cad7ac8e.tar.bz2
Change test suite separator character from '-' to ':'.
This allows defining test suites for test-valgrind target without the risk of e.g. being unable to differentiate the targets test-valgrind (testing with valgrind) from test-valgrind (testing the valgrind subproject).
-rw-r--r--mesonbuild/backend/ninjabackend.py2
-rw-r--r--mesonbuild/coredata.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 077254d..7a4b0cd 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -569,7 +569,7 @@ int dummy;
visible_name = 'for top level tests'
else:
visible_name = s
- elem = NinjaBuildElement(self.all_outputs, 'test-' + s, 'CUSTOM_COMMAND', ['all', 'PHONY'])
+ elem = NinjaBuildElement(self.all_outputs, 'test:' + s, 'CUSTOM_COMMAND', ['all', 'PHONY'])
elem.add_item('COMMAND', cmd + ['--suite=' + s])
elem.add_item('DESC', 'Running test suite %s.' % visible_name)
elem.add_item('pool', 'console')
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 9507a03..494c89f 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -228,8 +228,9 @@ forbidden_target_names = {'clean': None,
'PHONY': None,
'all': None,
'test': None,
+ 'test:': None,
'test-valgrind': None,
- 'test-': None,
+ 'test-valgrind:': None,
'benchmark': None,
'install': None,
'build.ninja': None,