diff options
| author | Andrew McNulty <amcn102@gmail.com> | 2024-10-11 17:41:56 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-01-19 20:59:53 +0200 |
| commit | 82fedf04033305e2b28db1eea2346018c237d167 (patch) | |
| tree | 346114c15ebdbc7a8d4ed890b955066ff618e2c0 /test cases | |
| parent | 843895b860dbfdbc4d8669006509adadeb173cbc (diff) | |
| download | meson-82fedf04033305e2b28db1eea2346018c237d167.tar.gz | |
interpreterbase: Add disabler exception for `get_variable` method
Add an exception to the disabler check to allow objects with a `get_variable`
method to not always pick a disabler if their arguments contain one. This
mimics the behaviour already in place for calls to function, which has a set
of excepted functions.
Closes #13717
Signed-off-by: Andrew McNulty <amcn102@gmail.com>
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/158 disabler/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/158 disabler/subprojects/bar/meson.build | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/test cases/common/158 disabler/meson.build b/test cases/common/158 disabler/meson.build index 65ca5fdf5..3ee26dfc9 100644 --- a/test cases/common/158 disabler/meson.build +++ b/test cases/common/158 disabler/meson.build @@ -151,3 +151,8 @@ foreach k, i : {'a': true, 'b': disabler(), 'c': true} endforeach assert(loops == 3, 'Disabler in foreach dict') assert(disablers == 1, 'Disabler in foreach dict') + +# https://github.com/mesonbuild/meson/issues/13717 +bar_subproject = subproject('bar') +bar_dep = bar_subproject.get_variable('bar_dep', disabler()) +assert(not is_disabler(bar_dep)) diff --git a/test cases/common/158 disabler/subprojects/bar/meson.build b/test cases/common/158 disabler/subprojects/bar/meson.build new file mode 100644 index 000000000..deed3ce57 --- /dev/null +++ b/test cases/common/158 disabler/subprojects/bar/meson.build @@ -0,0 +1,2 @@ +project('bar') +bar_dep = declare_dependency() |