From efd4e2a15badabbc7ce64465675d0c8cfaa1c585 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 20 Feb 2020 17:31:20 +0100 Subject: test: merge test_matrix.json and setup_env.json into test.json --- test cases/linuxlike/13 cmake dependency/setup_env.json | 3 --- test cases/linuxlike/13 cmake dependency/test.json | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 test cases/linuxlike/13 cmake dependency/setup_env.json create mode 100644 test cases/linuxlike/13 cmake dependency/test.json (limited to 'test cases/linuxlike') 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 aa1537496..000000000 --- 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 000000000..565713ee6 --- /dev/null +++ b/test cases/linuxlike/13 cmake dependency/test.json @@ -0,0 +1,5 @@ +{ + "env": { + "CMAKE_PREFIX_PATH": "@ROOT@/cmake_pref_env" + } +} -- cgit v1.2.3