aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2021-07-07 23:56:47 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2021-07-13 15:18:31 +0100
commita10b0c93eb5d32ab8ba1301c26bde2d98b556a29 (patch)
tree5a4596fc3444d0a1165a0369cca62d232915d920
parent317f9555a71e70429e8a8ac6c4fe71493c2ea936 (diff)
downloadmeson-a10b0c93eb5d32ab8ba1301c26bde2d98b556a29.zip
meson-a10b0c93eb5d32ab8ba1301c26bde2d98b556a29.tar.gz
meson-a10b0c93eb5d32ab8ba1301c26bde2d98b556a29.tar.bz2
Fix skip condition in sdl2 test.json
The build_machine.system() value we should be matching against is 'darwin', not 'macos', so this was expected to skip everywhere. Unfortunately, fixing this reveals that this test skips in our macos CI runs also, (I think) because brew doesn't (normally) provide frameworks, just pkgconfig files. So, also skip this test there, which means it doesn't run anywhere in CI currently.
-rw-r--r--test cases/frameworks/16 sdl2/test.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json
index 664dc84..1aeaf34 100644
--- a/test cases/frameworks/16 sdl2/test.json
+++ b/test cases/frameworks/16 sdl2/test.json
@@ -6,7 +6,7 @@
{ "val": "pkg-config" },
{ "val": "config-tool" },
{ "val": "sdlconfig" },
- { "val": "extraframework", "skip_on_os": ["!macos"] }
+ { "val": "extraframework", "skip_on_os": ["!darwin"], "skip_on_jobname": ["macos"] }
]
}
}