cmake: better logging
This commit is contained in:
parent
cb57847c30
commit
493e505d58
|
@ -154,6 +154,11 @@ steps:
|
||||||
where.exe python
|
where.exe python
|
||||||
python --version
|
python --version
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Locating cl, rc:"
|
||||||
|
where.exe cl
|
||||||
|
where.exe rc
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "=== Start running tests ==="
|
echo "=== Start running tests ==="
|
||||||
# Starting from VS2019 Powershell(?) will fail the test run
|
# Starting from VS2019 Powershell(?) will fail the test run
|
||||||
|
|
|
@ -227,6 +227,10 @@ def validate_install(srcdir, installdir, compiler, env):
|
||||||
for fname in found:
|
for fname in found:
|
||||||
if fname not in expected:
|
if fname not in expected:
|
||||||
ret_msg += 'Extra file {0} found.\n'.format(fname)
|
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
|
return ret_msg
|
||||||
|
|
||||||
def log_text_file(logfile, testdir, stdo, stde):
|
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
|
# print the meson log if available since it's a superset
|
||||||
# of stdout and often has very useful information.
|
# of stdout and often has very useful information.
|
||||||
failing_logs.append(result.mlog)
|
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:
|
else:
|
||||||
failing_logs.append(result.stdo)
|
failing_logs.append(result.stdo)
|
||||||
failing_logs.append(result.stde)
|
failing_logs.append(result.stde)
|
||||||
|
|
Loading…
Reference in New Issue