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/cmake | |
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/cmake')
-rw-r--r-- | test cases/cmake/16 threads/test.json | 11 | ||||
-rw-r--r-- | test cases/cmake/16 threads/test_matrix.json | 9 |
2 files changed, 11 insertions, 9 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" } - ] - } -} |