summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjan Molenaar <gaphor@gmail.com>2025-05-05 23:18:56 +0200
committerEli Schwartz <eschwartz93@gmail.com>2025-05-23 04:03:26 -0400
commit5463c644c86167fc8b4c6a9c389aaa6bd8b116ec (patch)
tree46a0df4c9da3c5cbed176f1eef5adafe7c23dfb6
parentbc18b160f52e365b3600292482be29e0be778ee8 (diff)
downloadmeson-5463c644c86167fc8b4c6a9c389aaa6bd8b116ec.tar.gz
vulkan: Add regression test with VULKAN_SDK variable
Add test cases that target the Vulkan system dependeny resolver explicitly.
-rw-r--r--test cases/frameworks/18 vulkan/meson.build4
-rw-r--r--test cases/frameworks/18 vulkan/meson.options6
-rw-r--r--test cases/frameworks/18 vulkan/test.json11
3 files changed, 20 insertions, 1 deletions
diff --git a/test cases/frameworks/18 vulkan/meson.build b/test cases/frameworks/18 vulkan/meson.build
index 5cfe89f76..ab9f29130 100644
--- a/test cases/frameworks/18 vulkan/meson.build
+++ b/test cases/frameworks/18 vulkan/meson.build
@@ -1,6 +1,8 @@
project('vulkan test', 'c')
-vulkan_dep = dependency('vulkan', required : false)
+method = get_option('method')
+
+vulkan_dep = dependency('vulkan', required : false, method : method)
if not vulkan_dep.found()
error('MESON_SKIP_TEST: vulkan not found.')
endif
diff --git a/test cases/frameworks/18 vulkan/meson.options b/test cases/frameworks/18 vulkan/meson.options
new file mode 100644
index 000000000..962fbe20c
--- /dev/null
+++ b/test cases/frameworks/18 vulkan/meson.options
@@ -0,0 +1,6 @@
+option(
+ 'method',
+ type : 'combo',
+ choices : ['auto', 'pkg-config', 'system'],
+ value : 'auto',
+)
diff --git a/test cases/frameworks/18 vulkan/test.json b/test cases/frameworks/18 vulkan/test.json
index 66afb97c3..820f07565 100644
--- a/test cases/frameworks/18 vulkan/test.json
+++ b/test cases/frameworks/18 vulkan/test.json
@@ -1,3 +1,14 @@
{
+ "env": {
+ "VULKAN_SDK": "/usr"
+ },
+ "matrix": {
+ "options": {
+ "method": [
+ { "val": "pkg-config" },
+ { "val": "system" }
+ ]
+ }
+ },
"expect_skip_on_jobname": ["azure", "cygwin", "macos", "msys2"]
}