summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-06-29 21:01:47 +0300
committerGitHub <noreply@github.com>2021-06-29 21:01:47 +0300
commit563f4c7b9feec3c16518130dd2c3bc2ff967bc90 (patch)
tree58a304f3e6b355a92eec684bcc87b5cfc5aa1976 /data
parent1f3adc4dbe20196eb45b7c0cfe502ce108618ada (diff)
parent5c0cb0547bd52230faff322a33bfeac0eaaeea0d (diff)
downloadmeson-563f4c7b9feec3c16518130dd2c3bc2ff967bc90.tar.gz
Merge pull request #8924 from jon-turney/fix-test-json-schema
Various fixes to test.json schema
Diffstat (limited to 'data')
-rw-r--r--data/test.schema.json25
1 files changed, 20 insertions, 5 deletions
diff --git a/data/test.schema.json b/data/test.schema.json
index aa3cf8fec..00c52aef6 100644
--- 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": [