From fac6f869e08c139d8d84cff56c479a10cad7ac8e Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Fri, 3 Jun 2016 21:17:57 +0300 Subject: [PATCH] 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). --- mesonbuild/backend/ninjabackend.py | 2 +- mesonbuild/coredata.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 077254df8..7a4b0cd96 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 9507a033c..494c89f68 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,