summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2024-03-15 19:21:51 +0100
committerEli Schwartz <eschwartz93@gmail.com>2024-03-17 04:46:26 -0400
commit0762b86e59629d82c1e7efaeb5dc6c1381d5af1a (patch)
treee1cbd4ab02adf1bd80107b77b6bc590e9c65c265 /data
parent05bbe45cc228c78c47f57c88a04acd937a60f8bb (diff)
downloadmeson-0762b86e59629d82c1e7efaeb5dc6c1381d5af1a.tar.gz
tests: rename skip_on_jobname to expect_skip_on_jobname and skip_on_os to expect_skip_on_os
The test.json format currently has three keys related to skipping tests: * `skip_on_jobname` * `skip_on_os` * `skip_on_env` While `skip_on_env` marks the test itself as skipped, i.e. they don't get run when the conditions are met, the other two skip options are just marking the test as "expected to be skipped" if the conditions apply, i.e. they want to see `MESON_SKIP_TEST` in the output and things will fail if that doesn't happen. They don't actually skip the tests as the names imply. To make this clearer rename the keys: * `skip_on_jobname` -> `expect_skip_on_jobname` * `skip_on_os` -> `expect_skip_on_os` `skip_on_env` stays the same, since that actually skips. The docs were also confused about this, so adjust that too.
Diffstat (limited to 'data')
-rw-r--r--data/test.schema.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/test.schema.json b/data/test.schema.json
index 6f6a19381..705413363 100644
--- a/data/test.schema.json
+++ b/data/test.schema.json
@@ -87,13 +87,13 @@
"type": "string"
}
},
- "skip_on_jobname": {
+ "expect_skip_on_jobname": {
"type": "array",
"items": {
"type": "string"
}
},
- "skip_on_os": {
+ "expect_skip_on_os": {
"type": "array",
"items": {
"type": "string"
@@ -167,13 +167,13 @@
"type": "string"
}
},
- "skip_on_jobname": {
+ "expect_skip_on_jobname": {
"type": "array",
"items": {
"type": "string"
}
},
- "skip_on_os": {
+ "expect_skip_on_os": {
"type": "array",
"items": {
"type": "string"