aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-03-28 12:55:39 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-03-28 14:47:55 +0530
commitf4f9272e87a5e21cbc255f47234f31212b7a8338 (patch)
tree800d483c910f245bb6560f9766b8b6d1ce38b310
parentebadef0fdf4bd7da38c3905224fabe482e1f9c88 (diff)
downloadmeson-f4f9272e87a5e21cbc255f47234f31212b7a8338.zip
meson-f4f9272e87a5e21cbc255f47234f31212b7a8338.tar.gz
meson-f4f9272e87a5e21cbc255f47234f31212b7a8338.tar.bz2
project tests: Don't look for PDB files on MinGW/GCC
-rwxr-xr-xrun_project_tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index a487da2..28de638 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -244,7 +244,7 @@ def validate_install(srcdir, installdir):
# 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'):
+ if fname not in expected and not fname.endswith('.pdb') and compiler == 'cl':
ret_msg += 'Extra file {0} found.\n'.format(fname)
return ret_msg
@@ -587,6 +587,7 @@ def generate_pb_static(compiler, object_suffix, static_suffix):
return stlibfile
def generate_prebuilt():
+ global compiler
static_suffix = 'a'
if shutil.which('cl'):
compiler = 'cl'