diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-20 21:09:57 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-25 21:47:42 +0100 |
| commit | 8e60b8c14610fe287df42a76a60148aae86b8284 (patch) | |
| tree | 83e57cf2b54dd97c4de912ec310a836f03269d2e /test cases/cmake | |
| parent | 3065202f6b02b0bfcbd84e0acc5090cdedeeedb4 (diff) | |
| download | meson-8e60b8c14610fe287df42a76a60148aae86b8284.zip meson-8e60b8c14610fe287df42a76a60148aae86b8284.tar.gz meson-8e60b8c14610fe287df42a76a60148aae86b8284.tar.bz2 | |
test: merge installed_files.txt into test.json
Diffstat (limited to 'test cases/cmake')
| -rw-r--r-- | test cases/cmake/2 advanced/installed_files.txt | 4 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/test.json | 8 | ||||
| -rw-r--r-- | test cases/cmake/3 advanced no dep/installed_files.txt | 6 | ||||
| -rw-r--r-- | test cases/cmake/3 advanced no dep/test.json | 10 |
4 files changed, 18 insertions, 10 deletions
diff --git a/test cases/cmake/2 advanced/installed_files.txt b/test cases/cmake/2 advanced/installed_files.txt deleted file mode 100644 index 4965cd1..0000000 --- a/test cases/cmake/2 advanced/installed_files.txt +++ /dev/null @@ -1,4 +0,0 @@ -usr/?lib/libcm_cmModLib?so -?cygwin:usr/lib/libcm_cmModLib?implib -?!cygwin:usr/bin/libcm_cmModLib?implib -usr/bin/cm_testEXE?exe diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json new file mode 100644 index 0000000..11aad94 --- /dev/null +++ b/test cases/cmake/2 advanced/test.json @@ -0,0 +1,8 @@ +{ + "installed": [ + {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"}, + {"type": "implib", "platform": "cygwin", "file": "usr/lib/libcm_cmModLib"}, + {"type": "implib", "platform": "!cygwin", "file": "usr/bin/libcm_cmModLib"}, + {"type": "exe", "file": "usr/bin/cm_testEXE"} + ] +} diff --git a/test cases/cmake/3 advanced no dep/installed_files.txt b/test cases/cmake/3 advanced no dep/installed_files.txt deleted file mode 100644 index 453c6c0..0000000 --- a/test cases/cmake/3 advanced no dep/installed_files.txt +++ /dev/null @@ -1,6 +0,0 @@ -usr/?lib/libcm_cmModLib?so -?cygwin:usr/lib/libcm_cmModLib?implib -?!cygwin:usr/bin/libcm_cmModLib?implib -?msvc:usr/bin/cm_cmModLib.pdb -?msvc:usr/bin/cm_testEXE.pdb -usr/bin/cm_testEXE?exe
\ No newline at end of file diff --git a/test cases/cmake/3 advanced no dep/test.json b/test cases/cmake/3 advanced no dep/test.json new file mode 100644 index 0000000..3b8b12d --- /dev/null +++ b/test cases/cmake/3 advanced no dep/test.json @@ -0,0 +1,10 @@ +{ + "installed": [ + {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"}, + {"type": "implib", "platform": "cygwin", "file": "usr/lib/libcm_cmModLib"}, + {"type": "implib", "platform": "!cygwin", "file": "usr/bin/libcm_cmModLib"}, + {"type": "pdb", "file": "usr/bin/cm_cmModLib"}, + {"type": "pdb", "file": "usr/bin/cm_testEXE"}, + {"type": "exe", "file": "usr/bin/cm_testEXE"} + ] +} |