diff options
| author | Jakub Adam <jakub.adam@collabora.com> | 2019-09-09 18:32:01 +0200 |
|---|---|---|
| committer | Jakub Adam <jakub.adam@collabora.com> | 2019-10-09 15:50:20 +0200 |
| commit | 9c456e2baf281682569ce89137148d7b5b3487f5 (patch) | |
| tree | 6b554b55f40dd20b26bb89dbfcccb03c5b6147d8 | |
| parent | 1bf17824766230a8ad0b2fe56040ff860c841d50 (diff) | |
| download | meson-9c456e2baf281682569ce89137148d7b5b3487f5.zip meson-9c456e2baf281682569ce89137148d7b5b3487f5.tar.gz meson-9c456e2baf281682569ce89137148d7b5b3487f5.tar.bz2 | |
tests: Don't expect any *.pdb files installed in 'lib'
Static libraries don't have PDB files. A PDB that would previously end
up installed alongside a static library belonged in fact to the dynamic
version of the same library built at the same time.
This was because the former minstall.Installer implementation, when
installing a file target, also blindly copied any *.pdb file it found
whose filename was matching the target. So, for example installing
foo.dll and foo.a would also install two copies of foo.pdb into both
bin/ and lib/, which doesn't seem like the right thing to do - foo.pdb
should only get installed with foo.dll.
3 files changed, 0 insertions, 5 deletions
diff --git a/test cases/common/206 install name_prefix name_suffix/installed_files.txt b/test cases/common/206 install name_prefix name_suffix/installed_files.txt index 240a8be..be61611 100644 --- a/test cases/common/206 install name_prefix name_suffix/installed_files.txt +++ b/test cases/common/206 install name_prefix name_suffix/installed_files.txt @@ -1,9 +1,6 @@ ?msvc:usr/bin/baz.pdb ?msvc:usr/bin/bowcorge.pdb ?msvc:usr/bin/foo.pdb -?msvc:usr/lib/baz.pdb -?msvc:usr/lib/bowcorge.pdb -?msvc:usr/lib/foo.pdb usr/?lib/bowcorge.stern usr/lib/?libbaz.cheese usr/lib/bar.a diff --git a/test cases/d/5 mixed/installed_files.txt b/test cases/d/5 mixed/installed_files.txt index 5950753..46b7721 100644 --- a/test cases/d/5 mixed/installed_files.txt +++ b/test cases/d/5 mixed/installed_files.txt @@ -5,4 +5,3 @@ usr/lib/libstuff.a ?msvc:usr/bin/stuff.dll ?msvc:usr/bin/stuff.pdb ?msvc:usr/lib/stuff.lib -?msvc:usr/lib/stuff.pdb diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt index 62b5c9a..f3a1e2d 100644 --- a/test cases/windows/7 dll versioning/installed_files.txt +++ b/test cases/windows/7 dll versioning/installed_files.txt @@ -4,7 +4,6 @@ ?msvc:usr/bin/noversion.dll ?msvc:usr/bin/noversion.pdb ?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 |