summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-12-12 23:47:10 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-12-13 00:47:10 +0200
commit3778a34979c1f705eda044960cc1f89233409f88 (patch)
tree9a52f95bb448ebcbe4249325c2c2d7b37e72bf2d
parent9371965132e8854db1b43b4bda61f0404b4b3609 (diff)
downloadmeson-3778a34979c1f705eda044960cc1f89233409f88.tar.gz
mintro: include test protocol in introspection data
-rw-r--r--docs/markdown/IDE-integration.md3
-rw-r--r--docs/markdown/snippets/introspect.md4
-rw-r--r--mesonbuild/mintro.py1
-rwxr-xr-xrun_unittests.py2
4 files changed, 8 insertions, 2 deletions
diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md
index 1c66d5388..77e00bde6 100644
--- a/docs/markdown/IDE-integration.md
+++ b/docs/markdown/IDE-integration.md
@@ -235,7 +235,7 @@ When these tests fail, the user probably wants to run the failing test in a
debugger. To make this as integrated as possible, extract the tests from the
`intro-tests.json` and `intro-benchmarks.json` files. This provides you with
all the information needed to run the test: what command to execute, command
-line arguments and environment variable settings.
+line arguments, environment variable settings and how to process the output.
```json
{
@@ -244,6 +244,7 @@ line arguments and environment variable settings.
"timeout": "the test timeout",
"suite": ["list", "of", "test", "suites"],
"is_parallel": true / false,
+ "protocol": "exitcode" / "tap",
"cmd": ["command", "to", "run"],
"env": {
"VARIABLE1": "value 1",
diff --git a/docs/markdown/snippets/introspect.md b/docs/markdown/snippets/introspect.md
index 097fd1704..9efa4d771 100644
--- a/docs/markdown/snippets/introspect.md
+++ b/docs/markdown/snippets/introspect.md
@@ -5,3 +5,7 @@ dependencies (--dependencies, intro-dependencies.json):
scanning dependencies (--scan-dependencies):
- added the `version` key containing the required dependency version
+
+tests and benchmarks (--tests, --benchmarks, intro-tests.json,
+intro-benchmarks.json):
+- added the `protocol` key
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index 1c9c54244..ff9f1d942 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -302,6 +302,7 @@ def get_test_list(testdata) -> List[Dict[str, Union[str, int, List[str], Dict[st
to['suite'] = t.suite
to['is_parallel'] = t.is_parallel
to['priority'] = t.priority
+ to['protocol'] = t.protocol
result.append(to)
return result
diff --git a/run_unittests.py b/run_unittests.py
index a7a0d2612..703673fb2 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2620,7 +2620,6 @@ int main(int argc, char **argv) {
'disttest-1.4.3/subprojects/vcssub/meson.build']),
sorted(z.namelist()))
-
def test_rpath_uses_ORIGIN(self):
'''
Test that built targets use $ORIGIN in rpath, which ensures that they
@@ -3813,6 +3812,7 @@ recommended as it is not supported on some platforms''')
('timeout', int),
('suite', list),
('is_parallel', bool),
+ ('protocol', str),
]
buildoptions_keylist = [