From efd4e2a15badabbc7ce64465675d0c8cfaa1c585 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Thu, 20 Feb 2020 17:31:20 +0100
Subject: test: merge test_matrix.json and setup_env.json into test.json

---
 test cases/frameworks/1 boost/test.json        | 21 +++++++++++++++++++++
 test cases/frameworks/1 boost/test_matrix.json | 19 -------------------
 2 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 test cases/frameworks/1 boost/test.json
 delete mode 100644 test cases/frameworks/1 boost/test_matrix.json

(limited to 'test cases/frameworks')

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" }
-  ]
-}
-- 
cgit v1.2.3