diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-20 17:31:20 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-25 21:47:37 +0100 |
| commit | efd4e2a15badabbc7ce64465675d0c8cfaa1c585 (patch) | |
| tree | 652e6c0f2626f5c4588aed29f37450c1037f8715 /test cases | |
| parent | 1da11be1323ebfa458bf488446deeeec443fc8cc (diff) | |
| download | meson-efd4e2a15badabbc7ce64465675d0c8cfaa1c585.zip meson-efd4e2a15badabbc7ce64465675d0c8cfaa1c585.tar.gz meson-efd4e2a15badabbc7ce64465675d0c8cfaa1c585.tar.bz2 | |
test: merge test_matrix.json and setup_env.json into test.json
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/cmake/16 threads/test.json | 11 | ||||
| -rw-r--r-- | test cases/cmake/16 threads/test_matrix.json | 9 | ||||
| -rw-r--r-- | test cases/frameworks/1 boost/test.json | 21 | ||||
| -rw-r--r-- | test cases/frameworks/1 boost/test_matrix.json | 19 | ||||
| -rw-r--r-- | test cases/linuxlike/13 cmake dependency/setup_env.json | 3 | ||||
| -rw-r--r-- | test cases/linuxlike/13 cmake dependency/test.json | 5 |
6 files changed, 37 insertions, 31 deletions
diff --git a/test cases/cmake/16 threads/test.json b/test cases/cmake/16 threads/test.json new file mode 100644 index 0000000..db788b1 --- /dev/null +++ b/test cases/cmake/16 threads/test.json @@ -0,0 +1,11 @@ +{ + "matrix": { + "options": { + "use_pthread": [ + { "val": "ON" }, + { "val": "OFF" }, + { "val": "NOT_SET" } + ] + } + } +} diff --git a/test cases/cmake/16 threads/test_matrix.json b/test cases/cmake/16 threads/test_matrix.json deleted file mode 100644 index 1c2c545..0000000 --- a/test cases/cmake/16 threads/test_matrix.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "options": { - "use_pthread": [ - { "val": "ON" }, - { "val": "OFF" }, - { "val": "NOT_SET" } - ] - } -} diff --git a/test cases/frameworks/1 boost/test.json b/test cases/frameworks/1 boost/test.json new file mode 100644 index 0000000..f4412d2 --- /dev/null +++ b/test cases/frameworks/1 boost/test.json @@ -0,0 +1,21 @@ +{ + "matrix": { + "options": { + "static": [ + { "val": "true", "skip_on_env": [ "SKIP_STATIC_BOOST" ] }, + { "val": "false" } + ], + "b_vscrt": [ + { "val": null }, + { "val": "md", "compilers": { "cpp": [ "msvc" ] } }, + { "val": "mdd", "compilers": { "cpp": [ "msvc" ] } }, + { "val": "mt", "compilers": { "cpp": [ "msvc" ] } }, + { "val": "mtd", "compilers": { "cpp": [ "msvc" ] } } + ] + }, + "exclude": [ + { "static": "false", "b_vscrt": "mt" }, + { "static": "false", "b_vscrt": "mtd" } + ] + } +} diff --git a/test cases/frameworks/1 boost/test_matrix.json b/test cases/frameworks/1 boost/test_matrix.json deleted file mode 100644 index 730610e..0000000 --- a/test cases/frameworks/1 boost/test_matrix.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "options": { - "static": [ - { "val": "true", "skip_on_env": [ "SKIP_STATIC_BOOST" ] }, - { "val": "false" } - ], - "b_vscrt": [ - { "val": null }, - { "val": "md", "compilers": { "cpp": [ "msvc" ] } }, - { "val": "mdd", "compilers": { "cpp": [ "msvc" ] } }, - { "val": "mt", "compilers": { "cpp": [ "msvc" ] } }, - { "val": "mtd", "compilers": { "cpp": [ "msvc" ] } } - ] - }, - "exclude": [ - { "static": "false", "b_vscrt": "mt" }, - { "static": "false", "b_vscrt": "mtd" } - ] -} 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 aa15374..0000000 --- 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 0000000..565713e --- /dev/null +++ b/test cases/linuxlike/13 cmake dependency/test.json @@ -0,0 +1,5 @@ +{ + "env": { + "CMAKE_PREFIX_PATH": "@ROOT@/cmake_pref_env" + } +} |