diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-09-13 02:53:09 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-09-12 21:31:26 -0500 |
| commit | c677925dc15a1f977e24d30a45d1b9b44289b880 (patch) | |
| tree | df28bdb5be3586fc1d2c6efb0b3e2eb8bc0239ea | |
| parent | e22b69bd17ccce5fdd6c0df36bd5dd34f6a1db19 (diff) | |
| download | meson-c677925dc15a1f977e24d30a45d1b9b44289b880.tar.gz | |
run_projects_tests: Fail if we install extra files even if not in cl
As per commit 2340fd3, unexpected installed files are not reported anymore when
using compilers other than 'cl', this regression was introduced in the attempt
of not reporting extra .pdb files, but actually caused any non extra .pdb file
in other compilers to be ignored.
Fix boolean test, by reporting any extra file a part '.pdb' ones under non 'cl'
compiler, while anyone under 'cl'.
| -rwxr-xr-x | run_project_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index a373aa07f..841f07287 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -193,8 +193,9 @@ def validate_install(srcdir, installdir, compiler, env): # 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': - ret_msg += 'Extra file {0} found.\n'.format(fname) + if fname not in expected: + if not (fname.endswith('.pdb') and compiler != 'cl'): + ret_msg += 'Extra file {0} found.\n'.format(fname) return ret_msg def log_text_file(logfile, testdir, stdo, stde): |