diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-06 11:09:48 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-03-09 11:57:26 -0700 |
| commit | 5ccda6878d3b8f494d65dfc084ba1a884329d57a (patch) | |
| tree | f8258a53524f23c8af711ae654ec04d267195e20 /test cases | |
| parent | ef1c6cdd543a44b6cfd1e86175ce64f2d742c415 (diff) | |
| download | meson-5ccda6878d3b8f494d65dfc084ba1a884329d57a.zip meson-5ccda6878d3b8f494d65dfc084ba1a884329d57a.tar.gz meson-5ccda6878d3b8f494d65dfc084ba1a884329d57a.tar.bz2 | |
project_tests: Add "version" to "shared_lib" and "pdb" types
This allows the harness to apply the version correctly, putting it in the right
place, dropping the right amount of numbers, etc.
pdb taking a version allows it to be more easily copied from the
shared_lib type.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/d/4 library versions/test.json | 26 | ||||
| -rw-r--r-- | test cases/d/7 multilib/test.json | 16 |
2 files changed, 21 insertions, 21 deletions
diff --git a/test cases/d/4 library versions/test.json b/test cases/d/4 library versions/test.json index 2a3433e..942122b 100644 --- a/test cases/d/4 library versions/test.json +++ b/test cases/d/4 library versions/test.json @@ -1,18 +1,18 @@ { "installed": [ - {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so.0"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsome.so.1.2.3"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libnoversion.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so.1"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libonlyversion.so.1.4.5"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libonlysoversion.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libonlysoversion.so.5"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/noversion.dll"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/onlysoversion-5.dll"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/onlyversion-1.dll"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/some-0.dll"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/some"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/some", "version": "0"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/some", "version": "1.2.3"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/noversion"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlyversion"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlyversion", "version": "1"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlyversion", "version": "1.4.5"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/onlysoversion", "version": "5"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/noversion"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlysoversion", "version": "5"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/onlyversion", "version": "1"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/some", "version": "0"}, {"type": "file", "platform": "msvc", "file": "usr/lib/noversion.lib"}, {"type": "file", "platform": "msvc", "file": "usr/lib/onlysoversion.lib"}, {"type": "file", "platform": "msvc", "file": "usr/lib/onlyversion.lib"}, diff --git a/test cases/d/7 multilib/test.json b/test cases/d/7 multilib/test.json index 408c4f2..2d51338 100644 --- a/test cases/d/7 multilib/test.json +++ b/test cases/d/7 multilib/test.json @@ -1,14 +1,14 @@ { "installed": [ {"type": "exe", "file": "usr/bin/app_d"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so.0"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay1.so.1.2.3"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so.1"}, - {"type": "file", "platform": "gcc", "file": "usr/lib/libsay2.so.1.2.4"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/say1-0.dll"}, - {"type": "file", "platform": "msvc", "file": "usr/bin/say2-1.dll"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "0"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say1", "version": "1.2.3"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2", "version": "1"}, + {"type": "shared_lib", "platform": "gcc", "file": "usr/lib/say2", "version": "1.2.4"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say1", "version": "0"}, + {"type": "shared_lib", "platform": "msvc", "file": "usr/bin/say2", "version": "1"}, {"type": "file", "platform": "msvc", "file": "usr/lib/say1.lib"}, {"type": "file", "platform": "msvc", "file": "usr/lib/say2.lib"} ] |