aboutsummaryrefslogtreecommitdiff
path: root/test cases/linuxlike
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-02-20 17:31:20 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-02-25 21:47:37 +0100
commitefd4e2a15badabbc7ce64465675d0c8cfaa1c585 (patch)
tree652e6c0f2626f5c4588aed29f37450c1037f8715 /test cases/linuxlike
parent1da11be1323ebfa458bf488446deeeec443fc8cc (diff)
downloadmeson-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/linuxlike')
-rw-r--r--test cases/linuxlike/13 cmake dependency/setup_env.json3
-rw-r--r--test cases/linuxlike/13 cmake dependency/test.json5
2 files changed, 5 insertions, 3 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 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"
+ }
+}