|
|
|
@ -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) |
|
|
|
|