diff options
| -rwxr-xr-x | run_project_tests.py | 3 | ||||
| -rw-r--r-- | test cases/windows/1 basic/installed_files.txt | 2 | ||||
| -rw-r--r-- | test cases/windows/1 basic/meson.build | 2 | ||||
| -rw-r--r-- | test cases/windows/8 msvc dll versioning/installed_files.txt | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index f87a121..1457432 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -181,6 +181,9 @@ def validate_install(srcdir, installdir): # 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'): ret_msg += 'Extra file {0} found.\n'.format(fname) return ret_msg diff --git a/test cases/windows/1 basic/installed_files.txt b/test cases/windows/1 basic/installed_files.txt new file mode 100644 index 0000000..8c8464a --- /dev/null +++ b/test cases/windows/1 basic/installed_files.txt @@ -0,0 +1,2 @@ +usr/bin/prog.exe +usr/bin/prog.pdb diff --git a/test cases/windows/1 basic/meson.build b/test cases/windows/1 basic/meson.build index f736b66..03d5436 100644 --- a/test cases/windows/1 basic/meson.build +++ b/test cases/windows/1 basic/meson.build @@ -1,4 +1,4 @@ project('wintest', 'c') -prog = executable('prog', 'prog.c') +prog = executable('prog', 'prog.c', install : true) test('wintest', prog) diff --git a/test cases/windows/8 msvc dll versioning/installed_files.txt b/test cases/windows/8 msvc dll versioning/installed_files.txt index 5f6e26a..e3f72bc 100644 --- a/test cases/windows/8 msvc dll versioning/installed_files.txt +++ b/test cases/windows/8 msvc dll versioning/installed_files.txt @@ -1,4 +1,6 @@ usr/bin/some-0.dll +usr/bin/some-0.pdb usr/lib/some.lib usr/bin/noversion.dll +usr/bin/noversion.pdb usr/lib/noversion.lib |