Merge pull request #8924 from jon-turney/fix-test-json-schema

Various fixes to test.json schema
4 years ago · 563f4c7b9f
parent 1f3adc4dbe 5c0cb0547b
commit 563f4c7b9f
2 changed files with 24 additions and 9 deletions
--- a/data/test.schema.json
+++ b/data/test.schema.json
@ -12,6 +12,7 @@
      "type": "array",
      "items": {
        "type": "object",
+        "additionalProperties": false,
        "properties": {
          "file": {
            "type": "string"
@ -53,15 +54,19 @@
    },
    "matrix": {
      "type": "object",
-      "additionalProperties": {
-        "properties": {
-          "options": {
+      "properties": {
+        "options": {
+          "additionalProperties": {
            "type": "array",
            "items": {
              "type": "object",
+              "additionalProperties": false,
              "properties": {
                "val": {
-                  "type": "string"
+                  "type": ["string", "boolean", "null", "array"],
+                  "items": {
+                    "type": "string"
+                  }
                },
                "compilers": {
                  "type": "object",
@ -86,7 +91,10 @@
            "items": {
              "type": "object",
              "additionalProperties": {
-                "type": "string"
+                "type": ["string", "boolean", "array"],
+                "items": {
+                  "type": "string"
+                }
              }
            }
          }
@ -110,6 +118,7 @@
      "type": "array",
      "items": {
        "type": "object",
+        "additionalProperties": false,
        "properties": {
          "line": {
            "type": "string"
@ -120,6 +129,12 @@
              "literal",
              "re"
            ]
+          },
+          "count": {
+            "type": "integer"
+          },
+          "comment": {
+            "type": "string"
          }
        },
        "required": [
--- a/cases/frameworks/1
+++ b/cases/frameworks/1
@ -7,10 +7,10 @@
      ],
      "b_vscrt": [
        { "val": null },
-        { "val": "md",  "compilers": { "cpp": [ "msvc" ] } },
-        { "val": "mdd", "compilers": { "cpp": [ "msvc" ] } },
-        { "val": "mt",  "compilers": { "cpp": [ "msvc" ] } },
-        { "val": "mtd", "compilers": { "cpp": [ "msvc" ] } }
+        { "val": "md",  "compilers": { "cpp": "msvc" } },
+        { "val": "mdd", "compilers": { "cpp": "msvc" } },
+        { "val": "mt",  "compilers": { "cpp": "msvc" } },
+        { "val": "mtd", "compilers": { "cpp": "msvc" } }
      ]
    },
    "exclude": [