aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2020-04-28 00:45:08 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2020-04-30 20:49:43 +0100
commit1dee6c618d879c20bf0a70eebc54bc8caf47716f (patch)
treeb186808bb7aece37a472a280d25b154eca3f9346 /docs
parent630cfd84ad9fd924ea56ccbf69cf37b040b2b3d3 (diff)
downloadmeson-1dee6c618d879c20bf0a70eebc54bc8caf47716f.zip
meson-1dee6c618d879c20bf0a70eebc54bc8caf47716f.tar.gz
meson-1dee6c618d879c20bf0a70eebc54bc8caf47716f.tar.bz2
Update test.json schema to add stdout
Update the test.json schema, adding the 'stdout' property. Also amend the test.json schema so the presence of an unexpected property on the root object causes a validation error. v2: Also add 'tools' property to json schema. Amend the documentation not to use the word 'list' to describe a dict.
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Contributing.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 34cd8ca..b16f615 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -329,10 +329,10 @@ Currently supported values are:
#### tools
-This section specifies a list of tool requirements in a simple key-value format.
+This section specifies a dict of tool requirements in a simple key-value format.
If a tool is specified, it has to be present in the environment, and the version
-requirement must be fulfilled match. Otherwise, the entire test is skipped
-(including every element in the test matrix).
+requirement must be fulfilled. Otherwise, the entire test is skipped (including
+every element in the test matrix).
#### stdout