diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-29 00:41:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 00:41:52 +0200 |
| commit | 7b050a9eeb7f1e266d4e72e760839954069e517e (patch) | |
| tree | ba34673f63a116ffba8f36c8376c5c21e9d4cbb6 /test cases/linuxlike | |
| parent | 175f12ac898c27b6488922d564dd0c5110f07803 (diff) | |
| parent | 6ef9d538de443b0f18f2387154aa528eb488d494 (diff) | |
| download | meson-7b050a9eeb7f1e266d4e72e760839954069e517e.tar.gz | |
Merge pull request #6666 from mensinda/testRefactor
Refactor run_projectests.py
Diffstat (limited to 'test cases/linuxlike')
6 files changed, 26 insertions, 16 deletions
diff --git a/test cases/linuxlike/13 cmake dependency/setup_env.json b/test cases/linuxlike/13 cmake dependency/setup_env.json deleted file mode 100644 index aa1537496..000000000 --- a/test cases/linuxlike/13 cmake dependency/setup_env.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "CMAKE_PREFIX_PATH": "@ROOT@/cmake_pref_env" -} diff --git a/test cases/linuxlike/13 cmake dependency/test.json b/test cases/linuxlike/13 cmake dependency/test.json new file mode 100644 index 000000000..565713ee6 --- /dev/null +++ b/test cases/linuxlike/13 cmake dependency/test.json @@ -0,0 +1,5 @@ +{ + "env": { + "CMAKE_PREFIX_PATH": "@ROOT@/cmake_pref_env" + } +} diff --git a/test cases/linuxlike/7 library versions/installed_files.txt b/test cases/linuxlike/7 library versions/installed_files.txt deleted file mode 100644 index 763a90709..000000000 --- a/test cases/linuxlike/7 library versions/installed_files.txt +++ /dev/null @@ -1,10 +0,0 @@ -usr/lib/libsome.so -usr/lib/libsome.so.0 -usr/lib/libsome.so.1.2.3 -usr/lib/libnoversion.so -usr/lib/libonlyversion.so -usr/lib/libonlyversion.so.1 -usr/lib/libonlyversion.so.1.4.5 -usr/lib/libonlysoversion.so -usr/lib/libonlysoversion.so.5 -usr/lib/libmodule.so diff --git a/test cases/linuxlike/7 library versions/test.json b/test cases/linuxlike/7 library versions/test.json new file mode 100644 index 000000000..0da9277bc --- /dev/null +++ b/test cases/linuxlike/7 library versions/test.json @@ -0,0 +1,14 @@ +{ + "installed": [ + {"type": "file", "file": "usr/lib/libsome.so"}, + {"type": "file", "file": "usr/lib/libsome.so.0"}, + {"type": "file", "file": "usr/lib/libsome.so.1.2.3"}, + {"type": "file", "file": "usr/lib/libnoversion.so"}, + {"type": "file", "file": "usr/lib/libonlyversion.so"}, + {"type": "file", "file": "usr/lib/libonlyversion.so.1"}, + {"type": "file", "file": "usr/lib/libonlyversion.so.1.4.5"}, + {"type": "file", "file": "usr/lib/libonlysoversion.so"}, + {"type": "file", "file": "usr/lib/libonlysoversion.so.5"}, + {"type": "file", "file": "usr/lib/libmodule.so"} + ] +} diff --git a/test cases/linuxlike/8 subproject library install/installed_files.txt b/test cases/linuxlike/8 subproject library install/installed_files.txt deleted file mode 100644 index 5c4a3018e..000000000 --- a/test cases/linuxlike/8 subproject library install/installed_files.txt +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libsublib.so -usr/lib/libsublib.so.5 -usr/lib/libsublib.so.2.1.0 diff --git a/test cases/linuxlike/8 subproject library install/test.json b/test cases/linuxlike/8 subproject library install/test.json new file mode 100644 index 000000000..5a2bf04c5 --- /dev/null +++ b/test cases/linuxlike/8 subproject library install/test.json @@ -0,0 +1,7 @@ +{ + "installed": [ + {"type": "file", "file": "usr/lib/libsublib.so"}, + {"type": "file", "file": "usr/lib/libsublib.so.5"}, + {"type": "file", "file": "usr/lib/libsublib.so.2.1.0"} + ] +} |