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/frameworks | |
| parent | 1da11be1323ebfa458bf488446deeeec443fc8cc (diff) | |
| download | meson-efd4e2a15badabbc7ce64465675d0c8cfaa1c585.tar.gz | |
test: merge test_matrix.json and setup_env.json into test.json
Diffstat (limited to 'test cases/frameworks')
| -rw-r--r-- | test cases/frameworks/1 boost/test.json | 21 | ||||
| -rw-r--r-- | test cases/frameworks/1 boost/test_matrix.json | 19 |
2 files changed, 21 insertions, 19 deletions
diff --git a/test cases/frameworks/1 boost/test.json b/test cases/frameworks/1 boost/test.json new file mode 100644 index 000000000..f4412d2ef --- /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 730610ee5..000000000 --- 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" } - ] -} |