Merge pull request #4170 from 3v1n0/test-projects-extra-file-reports-fix

run_projects_tests: Fail if we install extra files even if not in cl

1 files changed, 6 insertions, 7 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index a373aa0..27e588b 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -158,6 +158,11 @@ def platform_fix_name(fname, compiler, env):
         if compiler == 'cl':
             return None
 
+    if fname.startswith('?cygwin:'):
+        fname = fname[8:]
+        if compiler == 'cl' or not mesonlib.for_cygwin(env.is_cross_build(), env):
+            return None
+
     return fname
 
 def validate_install(srcdir, installdir, compiler, env):
@@ -183,17 +188,11 @@ 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 and not fname.endswith('.pdb') and compiler == 'cl':
+        if fname not in expected:
             ret_msg += 'Extra file {0} found.\n'.format(fname)
     return ret_msg