aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2017-01-05 00:37:56 +0200
committerHemmo Nieminen <hemmo.nieminen@iki.fi>2017-01-12 22:17:12 +0200
commitb90956c2f2eaf773b2122419e870699cf0410fd8 (patch)
tree900959d1c6ceb3a909576ecad5e3e41d495132bb /mesonbuild/interpreter.py
parenteea067087261fbeb19ff12ee6a6def95e0141322 (diff)
downloadmeson-b90956c2f2eaf773b2122419e870699cf0410fd8.zip
meson-b90956c2f2eaf773b2122419e870699cf0410fd8.tar.gz
meson-b90956c2f2eaf773b2122419e870699cf0410fd8.tar.bz2
mesontest: Improve test suite selection.
Suite option can now be given to specify in more detail which tests should be run.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py16
1 files changed, 8 insertions, 8 deletions
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)