aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-04-05 22:38:27 +0200
committerNicolas Schneider <nioncode+git@gmail.com>2016-04-05 23:05:09 +0200
commit42e6b78351a05eeb284bb287aa2b5e4e84e1d94d (patch)
tree91fa104bb76b8f166a2477568c72a29198f26bd4 /run_tests.py
parentff9d879eeab87df01d201ac9c09c094721dc256d (diff)
downloadmeson-42e6b78351a05eeb284bb287aa2b5e4e84e1d94d.zip
meson-42e6b78351a05eeb284bb287aa2b5e4e84e1d94d.tar.gz
meson-42e6b78351a05eeb284bb287aa2b5e4e84e1d94d.tar.bz2
do not print anything during tests
Otherwise, output from parallel tests might interleave. Let the main loop handle printing of additional info.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index 714ebe1..3a5ccbd 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -245,7 +245,6 @@ def _run_test(testdir, test_build_dir, install_dir, extra_args, flags, compile_c
if returncode != 0:
return TestResult('Running unit tests failed.', stdo, stde, gen_time, build_time, test_time)
if len(install_commands) == 0:
- print("Skipping install test")
return TestResult('', '', '', gen_time, build_time, test_time)
else:
env = os.environ.copy()
@@ -320,7 +319,8 @@ def run_tests(extra_args):
global skipped_tests
skipped_tests += 1
else:
- print('Running test: ' + t)
+ without_install = "" if len(install_commands) > 0 else " (without install)"
+ print('Running test%s: %s' % (without_install, t))
conf_time += result.conftime
build_time += result.buildtime
test_time += result.testtime