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.

1 files changed, 5 insertions, 5 deletions

diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
index cf8aa3acc..f9bb64580 100644
--- a/test cases/frameworks/15 llvm/test.json
+++ b/test cases/frameworks/15 llvm/test.json
@@ -2,17 +2,17 @@
   "matrix": {
     "options": {
       "method": [
-        { "val": "config-tool", "skip_on_jobname": ["msys2-gcc"] },
-        { "val": "cmake", "skip_on_jobname": ["msys2"] },
-        { "val": "combination", "skip_on_jobname": ["msys2"] }
+        { "val": "config-tool", "expect_skip_on_jobname": ["msys2-gcc"] },
+        { "val": "cmake", "expect_skip_on_jobname": ["msys2"] },
+        { "val": "combination", "expect_skip_on_jobname": ["msys2"] }
       ],
       "link-static": [
-        { "val": true, "skip_on_jobname": ["arch", "opensuse", "linux-gentoo-gcc"] },
+        { "val": true, "expect_skip_on_jobname": ["arch", "opensuse", "linux-gentoo-gcc"] },
         { "val": false }
       ]
     }
   },
-  "skip_on_jobname": ["azure", "cygwin"],
+  "expect_skip_on_jobname": ["azure", "cygwin"],
   "tools": {
     "cmake": ">=3.11"
   }