summaryrefslogtreecommitdiff
path: root/test cases/common
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2025-05-03 18:28:28 +0200
committerDylan Baker <dylan@pnwbakers.com>2025-05-06 13:21:24 -0700
commitb244b4067ccce234c71fb76192e1656073290d56 (patch)
treebc71773ae3bc07c62983d7ef0a3e9ef8bb90f9d5 /test cases/common
parent42d531da65f7d51803ad05dcdd18a650827a062c (diff)
downloadmeson-b244b4067ccce234c71fb76192e1656073290d56.tar.gz
test cases: cover passing default_options together with static: true
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases/common')
-rw-r--r--test cases/common/98 subproject subdir/meson.build2
-rw-r--r--test cases/common/98 subproject subdir/subprojects/sub_static/meson.build1
-rw-r--r--test cases/common/98 subproject subdir/subprojects/sub_static/meson_options.txt1
3 files changed, 3 insertions, 1 deletions
diff --git a/test cases/common/98 subproject subdir/meson.build b/test cases/common/98 subproject subdir/meson.build
index d2bafedf5..5d92772c1 100644
--- a/test cases/common/98 subproject subdir/meson.build
+++ b/test cases/common/98 subproject subdir/meson.build
@@ -83,7 +83,7 @@ d = dependency('subsubsub')
assert(d.found(), 'Should be able to fallback to sub-sub-subproject')
# Verify that `static: true` implies 'default_library=static'.
-d = dependency('sub_static', static: true)
+d = dependency('sub_static', static: true, default_options: ['bar=true'])
assert(d.found())
# Verify that when not specifying static kwarg we can still get fallback dep.
d = dependency('sub_static')
diff --git a/test cases/common/98 subproject subdir/subprojects/sub_static/meson.build b/test cases/common/98 subproject subdir/subprojects/sub_static/meson.build
index 6c00623a1..8de7cb406 100644
--- a/test cases/common/98 subproject subdir/subprojects/sub_static/meson.build
+++ b/test cases/common/98 subproject subdir/subprojects/sub_static/meson.build
@@ -1,6 +1,7 @@
project('sub_static')
assert(get_option('default_library') == 'static')
+assert(get_option('bar') == true)
meson.override_dependency('sub_static', declare_dependency())
meson.override_dependency('sub_static2', declare_dependency(), static: true)
meson.override_dependency('sub_static3', declare_dependency(variables: {'static': 'true'}), static: true)
diff --git a/test cases/common/98 subproject subdir/subprojects/sub_static/meson_options.txt b/test cases/common/98 subproject subdir/subprojects/sub_static/meson_options.txt
new file mode 100644
index 000000000..129a7d4a0
--- /dev/null
+++ b/test cases/common/98 subproject subdir/subprojects/sub_static/meson_options.txt
@@ -0,0 +1 @@
+option('bar', type: 'boolean', value: false)