From c677925dc15a1f977e24d30a45d1b9b44289b880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 13 Sep 2018 02:53:09 +0200 Subject: 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'. --- run_project_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'run_project_tests.py') diff --git a/run_project_tests.py b/run_project_tests.py index a373aa0..841f072 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): -- cgit v1.1 From 81e7a0981b7a815c8a85c731d7b2ca7676145130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Sep 2018 08:48:56 +0200 Subject: run_project_tests: remove pdb workaround, just use filters And ignore .dll.a files in non cygwin gcc instances --- run_project_tests.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'run_project_tests.py') 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): -- cgit v1.1 From 0fc9a6018975c641d677f2827bbc58481dcd8d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Sep 2018 21:43:24 +0200 Subject: run_proect_tests: add cygwin as platform fix name --- run_project_tests.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'run_project_tests.py') diff --git a/run_project_tests.py b/run_project_tests.py index 54b25a5..27e588b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -155,7 +155,12 @@ def platform_fix_name(fname, compiler, env): if fname.startswith('?gcc:'): fname = fname[5:] - if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), 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 -- cgit v1.1