aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-04-19 10:18:47 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-06-06 18:27:04 +0200
commit493e505d58f02d7ea63a8a41978adb0ecb314091 (patch)
tree57e22b305aff4755c6f68e012f8bb90aae319e2a /run_project_tests.py
parentcb57847c30ce49d03e2b98f8466b11acf3cf21fd (diff)
downloadmeson-493e505d58f02d7ea63a8a41978adb0ecb314091.zip
meson-493e505d58f02d7ea63a8a41978adb0ecb314091.tar.gz
meson-493e505d58f02d7ea63a8a41978adb0ecb314091.tar.bz2
cmake: better logging
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index f4b4a96..268e254 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -227,6 +227,10 @@ def validate_install(srcdir, installdir, compiler, env):
for fname in found:
if fname not in expected:
ret_msg += 'Extra file {0} found.\n'.format(fname)
+ if ret_msg != '':
+ ret_msg += '\nInstall dir contents:\n'
+ for i in found:
+ ret_msg += ' - {}'.format(i)
return ret_msg
def log_text_file(logfile, testdir, stdo, stde):
@@ -670,6 +674,12 @@ def _run_tests(all_tests, log_name_base, failfast, extra_args):
# print the meson log if available since it's a superset
# of stdout and often has very useful information.
failing_logs.append(result.mlog)
+ elif under_ci:
+ # Always print the complete meson log when running in
+ # a CI. This helps debugging issues that only occur in
+ # a hard to reproduce environment
+ failing_logs.append(result.mlog)
+ failing_logs.append(result.stdo)
else:
failing_logs.append(result.stdo)
failing_logs.append(result.stde)