aboutsummaryrefslogtreecommitdiff
path: root/meson_test.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-12-10 22:22:42 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-12-10 22:22:42 +0200
commitb3d61beb2d8194228bda193f6ae17f4dc4b3e7b4 (patch)
tree30f2ff4fab2228fc05b367e50b2c85ce0bb207bb /meson_test.py
parent70695bead40f97825357e620394918d1a248bf1a (diff)
downloadmeson-b3d61beb2d8194228bda193f6ae17f4dc4b3e7b4.zip
meson-b3d61beb2d8194228bda193f6ae17f4dc4b3e7b4.tar.gz
meson-b3d61beb2d8194228bda193f6ae17f4dc4b3e7b4.tar.bz2
A test can be part of multiple suites.
Diffstat (limited to 'meson_test.py')
-rwxr-xr-xmeson_test.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson_test.py b/meson_test.py
index 5771fa3..53dc6ea 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -149,7 +149,7 @@ def drain_futures(futures):
def filter_tests(suite, tests):
if suite is None:
return tests
- return [x for x in tests if x.suite == suite]
+ return [x for x in tests if suite in x.suite]
def run_tests(options, datafilename):
logfile_base = 'meson-logs/testlog'
@@ -182,10 +182,10 @@ def run_tests(options, datafilename):
futures = []
filtered_tests = filter_tests(options.suite, tests)
for i, test in enumerate(filtered_tests):
- if test.suite == '':
+ if test.suite[0] == '':
visible_name = test.name
else:
- visible_name = test.suite + ' / ' + test.name
+ visible_name = test.suite[0] + ' / ' + test.name
if not test.is_parallel:
drain_futures(futures)
futures = []