diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-12 19:40:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 19:40:08 +0300 |
| commit | f695359e1d487deaada8db61694cc24f10985580 (patch) | |
| tree | 24945e551de3e9090f32c366f5b0f667d9b233c2 /test cases | |
| parent | fa1bb2a67649ee730387a6b3a4f030933b4573fb (diff) | |
| parent | ba7b50a1045e6a57710137dd856e031ca5e96566 (diff) | |
| download | meson-f695359e1d487deaada8db61694cc24f10985580.zip meson-f695359e1d487deaada8db61694cc24f10985580.tar.gz meson-f695359e1d487deaada8db61694cc24f10985580.tar.bz2 | |
Merge pull request #6958 from jon-turney/fix-name-prefix-explicit-default
Fix library(name_prefix: [])
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/206 install name_prefix name_suffix/meson.build | 3 | ||||
| -rw-r--r-- | test cases/common/206 install name_prefix name_suffix/test.json | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test cases/common/206 install name_prefix name_suffix/meson.build b/test cases/common/206 install name_prefix name_suffix/meson.build index 4539999..044f915 100644 --- a/test cases/common/206 install name_prefix name_suffix/meson.build +++ b/test cases/common/206 install name_prefix name_suffix/meson.build @@ -8,3 +8,6 @@ static_library('qux', 'libfile.c', name_suffix: 'cheese', install : true) shared_library('corge', 'libfile.c', name_prefix: 'bow', name_suffix: 'stern', install : true) static_library('grault', 'libfile.c', name_prefix: 'bow', name_suffix: 'stern', install : true) + +# exercise default name_prefix and name_suffix +shared_library('garply', 'libfile.c', name_prefix: [], name_suffix: [], install : true) diff --git a/test cases/common/206 install name_prefix name_suffix/test.json b/test cases/common/206 install name_prefix name_suffix/test.json index 63032bc..b92a985 100644 --- a/test cases/common/206 install name_prefix name_suffix/test.json +++ b/test cases/common/206 install name_prefix name_suffix/test.json @@ -11,6 +11,9 @@ {"type": "implib", "file": "usr/lib/foo"}, {"type": "expr", "file": "usr/lib/foo?so"}, {"type": "implib", "file": "usr/lib/libbaz"}, - {"type": "file", "file": "usr/lib/libqux.cheese"} + {"type": "file", "file": "usr/lib/libqux.cheese"}, + {"type": "expr", "file": "usr/?lib/libgarply?so"}, + {"type": "implib", "file": "usr/lib/libgarply"}, + {"type": "pdb", "file": "usr/bin/garply"} ] } |