diff options
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index a3aa07d..f6d83b5 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -161,6 +161,11 @@ def platform_fix_name(fname, compiler, env): if not mesonlib.for_cygwin(env.is_cross_build(), env): return None + if fname.startswith('?!cygwin:'): + fname = fname[9:] + if mesonlib.for_cygwin(env.is_cross_build(), env): + return None + if fname.endswith('?so'): if mesonlib.for_windows(env.is_cross_build(), env) and canonical_compiler == 'msvc': fname = re.sub(r'lib/([^/]*)\?so$', r'bin/\1.dll', fname) @@ -222,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): @@ -553,6 +562,7 @@ def skip_csharp(backend): def detect_tests_to_run(): # Name, subdirectory, skip condition. all_tests = [ + ('cmake', 'cmake', not shutil.which('cmake') or (os.environ.get('compiler') == 'msvc2015' and under_ci)), ('common', 'common', False), ('warning-meson', 'warning', False), ('failing-meson', 'failing', False), @@ -664,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) |