aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2018-09-14 08:48:56 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2018-09-14 20:19:35 +0200
commit81e7a0981b7a815c8a85c731d7b2ca7676145130 (patch)
tree54ed0efb54c4a67c2b9c8b8482e8b9963828e391
parentb484f2ae2214d87a3f0af3cc3977fe72dcd4f59b (diff)
downloadmeson-81e7a0981b7a815c8a85c731d7b2ca7676145130.zip
meson-81e7a0981b7a815c8a85c731d7b2ca7676145130.tar.gz
meson-81e7a0981b7a815c8a85c731d7b2ca7676145130.tar.bz2
run_project_tests: remove pdb workaround, just use filters
And ignore .dll.a files in non cygwin gcc instances
-rwxr-xr-xrun_project_tests.py11
-rw-r--r--test cases/windows/1 basic/installed_files.txt2
-rw-r--r--test cases/windows/11 exe implib/installed_files.txt4
-rw-r--r--test cases/windows/7 dll versioning/installed_files.txt1
4 files changed, 6 insertions, 12 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):
diff --git a/test cases/windows/1 basic/installed_files.txt b/test cases/windows/1 basic/installed_files.txt
index 8c8464a..5022d28 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 bd2abe9..b1e805c 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 0d91c7c..517620e 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