run_project_tests: remove pdb workaround, just use filters

And ignore .dll.a files in non cygwin gcc instances
pull/4170/head
Marco Trevisan (Treviño) 6 years ago
parent b484f2ae22
commit 81e7a0981b
  1. 11
      run_project_tests.py
  2. 2
      test cases/windows/1 basic/installed_files.txt
  3. 4
      test cases/windows/11 exe implib/installed_files.txt
  4. 1
      test cases/windows/7 dll versioning/installed_files.txt

@ -155,7 +155,7 @@ def platform_fix_name(fname, compiler, env):
if fname.startswith('?gcc:'): if fname.startswith('?gcc:'):
fname = fname[5:] 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 None
return fname return fname
@ -183,19 +183,12 @@ def validate_install(srcdir, installdir, compiler, env):
expected[fname] = True expected[fname] = True
for (fname, found) in expected.items(): for (fname, found) in expected.items():
if not found: 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) ret_msg += 'Expected file {0} missing.\n'.format(fname)
# Check if there are any unexpected files # Check if there are any unexpected files
found = get_relative_files_list_from_dir(installdir) found = get_relative_files_list_from_dir(installdir)
for fname in found: 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 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 return ret_msg
def log_text_file(logfile, testdir, stdo, stde): def log_text_file(logfile, testdir, stdo, stde):

@ -1,2 +1,2 @@
usr/bin/prog.exe usr/bin/prog.exe
usr/bin/prog.pdb ?msvc:usr/bin/prog.pdb

@ -1,7 +1,7 @@
usr/bin/prog.exe usr/bin/prog.exe
usr/bin/prog.pdb ?msvc:usr/bin/prog.pdb
usr/bin/prog2.exe usr/bin/prog2.exe
usr/bin/prog2.pdb ?msvc:usr/bin/prog2.pdb
?gcc:usr/lib/libprog.exe.a ?gcc:usr/lib/libprog.exe.a
?gcc:usr/lib/libburble.a ?gcc:usr/lib/libburble.a
?msvc:usr/lib/prog.exe.lib ?msvc:usr/lib/prog.exe.lib

@ -6,6 +6,7 @@
?msvc:usr/lib/noversion.lib ?msvc:usr/lib/noversion.lib
?msvc:usr/lib/noversion.pdb ?msvc:usr/lib/noversion.pdb
?msvc:usr/bin/onlyversion-1.dll ?msvc:usr/bin/onlyversion-1.dll
?msvc:usr/bin/onlyversion-1.pdb
?msvc:usr/lib/onlyversion.lib ?msvc:usr/lib/onlyversion.lib
?msvc:usr/bin/onlysoversion-5.dll ?msvc:usr/bin/onlysoversion-5.dll
?msvc:usr/bin/onlysoversion-5.pdb ?msvc:usr/bin/onlysoversion-5.pdb

Loading…
Cancel
Save