From 81e7a0981b7a815c8a85c731d7b2ca7676145130 Mon Sep 17 00:00:00 2001 From: "Marco Trevisan (Treviño)" Date: Fri, 14 Sep 2018 08:48:56 +0200 Subject: run_project_tests: remove pdb workaround, just use filters And ignore .dll.a files in non cygwin gcc instances --- run_project_tests.py | 11 ++--------- test cases/windows/1 basic/installed_files.txt | 2 +- test cases/windows/11 exe implib/installed_files.txt | 4 ++-- test cases/windows/7 dll versioning/installed_files.txt | 1 + 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index 841f07287..54b25a55f 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): diff --git a/test cases/windows/1 basic/installed_files.txt b/test cases/windows/1 basic/installed_files.txt index 8c8464a6d..5022d2870 100644 --- a/test cases/windows/1 basic/installed_files.txt +++ b/test cases/windows/1 basic/installed_files.txt @@ -1,2 +1,2 @@ usr/bin/prog.exe -usr/bin/prog.pdb +?msvc:usr/bin/prog.pdb diff --git a/test cases/windows/11 exe implib/installed_files.txt b/test cases/windows/11 exe implib/installed_files.txt index bd2abe92b..b1e805c64 100644 --- a/test cases/windows/11 exe implib/installed_files.txt +++ b/test cases/windows/11 exe implib/installed_files.txt @@ -1,7 +1,7 @@ usr/bin/prog.exe -usr/bin/prog.pdb +?msvc:usr/bin/prog.pdb usr/bin/prog2.exe -usr/bin/prog2.pdb +?msvc:usr/bin/prog2.pdb ?gcc:usr/lib/libprog.exe.a ?gcc:usr/lib/libburble.a ?msvc:usr/lib/prog.exe.lib diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt index 0d91c7cd7..517620e77 100644 --- a/test cases/windows/7 dll versioning/installed_files.txt +++ b/test cases/windows/7 dll versioning/installed_files.txt @@ -6,6 +6,7 @@ ?msvc:usr/lib/noversion.lib ?msvc:usr/lib/noversion.pdb ?msvc:usr/bin/onlyversion-1.dll +?msvc:usr/bin/onlyversion-1.pdb ?msvc:usr/lib/onlyversion.lib ?msvc:usr/bin/onlysoversion-5.dll ?msvc:usr/bin/onlysoversion-5.pdb -- cgit v1.3