aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-02-15 16:25:10 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-02-15 16:50:41 -0500
commit00aa43d267244bf634faee8fe8a9f52ed8b6b1ff (patch)
tree76dbc3e4183fd1f86addb6ee36e3f694bdea1ff0
parent6240920c213fb76b4e4be8b6b59ae3346cbbcf77 (diff)
downloadmeson-00aa43d267244bf634faee8fe8a9f52ed8b6b1ff.zip
meson-00aa43d267244bf634faee8fe8a9f52ed8b6b1ff.tar.gz
meson-00aa43d267244bf634faee8fe8a9f52ed8b6b1ff.tar.bz2
fix missing documentation for testsuite option in test.json
stdout line matching supports count since commit 66d62a224e92c41d6012dc6c23912a965da4da8f to fail if certain output is present (count: 0) but it was never documented in the contribution guidelines.
-rw-r--r--docs/markdown/Contributing.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 0fd6606..3340b5c 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -387,6 +387,7 @@ Each dict contains the following keys:
- `line`
- `match` (optional)
+- `count` (optional)
Each item in the list is matched, in order, against the remaining
actual stdout lines, after any previous matches. If the actual stdout
@@ -401,6 +402,10 @@ matched:
| `literal` | Literal match (default) |
| `re` | regex match |
+The `count` element determines how many times the line is expected, and allowed,
+to be in the output. If unspecified, it must appear "any number of times, but at
+least once".
+
#### skip_on_env
The `skip_on_env` key can be used to specify a list of environment variables. If