diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-20 17:32:24 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-02-25 21:47:42 +0100 |
| commit | 3065202f6b02b0bfcbd84e0acc5090cdedeeedb4 (patch) | |
| tree | 27c90914d7c1d4e555281d21c24d78683f3f420c /test cases | |
| parent | efd4e2a15badabbc7ce64465675d0c8cfaa1c585 (diff) | |
| download | meson-3065202f6b02b0bfcbd84e0acc5090cdedeeedb4.tar.gz | |
test: realise test_args.txt with a test matrix
Diffstat (limited to 'test cases')
4 files changed, 18 insertions, 8 deletions
diff --git a/test cases/common/105 testframework options/test.json b/test cases/common/105 testframework options/test.json new file mode 100644 index 000000000..65bf3c04f --- /dev/null +++ b/test cases/common/105 testframework options/test.json @@ -0,0 +1,10 @@ +{ + "matrix": { + "options": { + "testoption": [{ "val": "A string with spaces" }], + "other_one": [{ "val": "true" }], + "combo_opt": [{ "val": "one" }], + "werror": [{ "val": "true" }] + } + } +} diff --git a/test cases/common/105 testframework options/test_args.txt b/test cases/common/105 testframework options/test_args.txt deleted file mode 100644 index a667e3a58..000000000 --- a/test cases/common/105 testframework options/test_args.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is not read by meson itself, but by the test framework. -# It is not possible to pass arguments to meson from a file. -['--werror', '-D', 'testoption=A string with spaces', '-D', 'other_one=true', \ - '-D', 'combo_opt=one'] diff --git a/test cases/common/176 initial c_args/test.json b/test cases/common/176 initial c_args/test.json new file mode 100644 index 000000000..f9b73a47d --- /dev/null +++ b/test cases/common/176 initial c_args/test.json @@ -0,0 +1,8 @@ +{ + "matrix": { + "options": { + "c_args": [{ "val": "-funroll-loops" }], + "c_link_args": [{ "val": "-Dtest_harmless_but_useless_link_arg" }] + } + } +} diff --git a/test cases/common/176 initial c_args/test_args.txt b/test cases/common/176 initial c_args/test_args.txt deleted file mode 100644 index 166e48171..000000000 --- a/test cases/common/176 initial c_args/test_args.txt +++ /dev/null @@ -1,4 +0,0 @@ -# This file is not read by meson itself, but by the test framework. -# It is not possible to pass arguments to meson from a file. -['-Dc_args=-march=native', '-Dc_args=-funroll-loops', - '-Dc_link_args=-Dtest_harmless_but_useless_link_arg'] |