mintro: include test protocol in introspection data

pull/4325/head
Paolo Bonzini 5 years ago committed by Jussi Pakkanen
parent 9371965132
commit 3778a34979
  1. 3
      docs/markdown/IDE-integration.md
  2. 4
      docs/markdown/snippets/introspect.md
  3. 1
      mesonbuild/mintro.py
  4. 2
      run_unittests.py

@ -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",

@ -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

@ -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

@ -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 = [

Loading…
Cancel
Save