From b90956c2f2eaf773b2122419e870699cf0410fd8 Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Thu, 5 Jan 2017 00:37:56 +0200 Subject: mesontest: Improve test suite selection. Suite option can now be given to specify in more detail which tests should be run. --- mesonbuild/interpreter.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mesonbuild/interpreter.py') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 33c592c..407507a 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2080,14 +2080,14 @@ requirements use the version keyword argument instead.''') workdir = None if not isinstance(timeout, int): raise InterpreterException('Timeout must be an integer.') - suite = mesonlib.stringlistify(kwargs.get('suite', '')) - if self.is_subproject(): - newsuite = [] - for s in suite: - if len(s) > 0: - s = '.' + s - newsuite.append(self.subproject.replace(' ', '_').replace('.', '_') + s) - suite = newsuite + suite = [] + for s in mesonlib.stringlistify(kwargs.get('suite', '')): + if len(s) > 0: + s = ':' + s + if self.is_subproject(): + suite.append(self.subproject.replace(' ', '_').replace(':', '_') + s) + else: + suite.append(self.build.project_name.replace(' ', '_').replace(':', '_') + s) t = Test(args[0], suite, args[1].held_object, par, cmd_args, env, should_fail, timeout, workdir) if is_base_test: self.build.tests.append(t) -- cgit v1.1