diff options
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 841f072..54b25a5 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -155,7 +155,7 @@ def platform_fix_name(fname, compiler, env): if fname.startswith('?gcc:'): fname = fname[5:] - if compiler == 'cl': + if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env): return None return fname @@ -183,19 +183,12 @@ def validate_install(srcdir, installdir, compiler, env): expected[fname] = True for (fname, found) in expected.items(): if not found: - # Ignore missing PDB files if we aren't using cl - if fname.endswith('.pdb') and compiler != 'cl': - continue ret_msg += 'Expected file {0} missing.\n'.format(fname) # Check if there are any unexpected files found = get_relative_files_list_from_dir(installdir) for fname in found: - # Windows-specific tests check for the existence of installed PDB - # files, but common tests do not, for obvious reasons. Ignore any - # extra PDB files found. if fname not in expected: - if not (fname.endswith('.pdb') and compiler != 'cl'): - ret_msg += 'Extra file {0} found.\n'.format(fname) + ret_msg += 'Extra file {0} found.\n'.format(fname) return ret_msg def log_text_file(logfile, testdir, stdo, stde): |