diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-04-14 12:58:30 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-02-13 23:57:48 +0200 |
| commit | d37d649b08b832d52fa684bc0506829fb40d5261 (patch) | |
| tree | c66e1461e91d6349457b826978e866fdabb19de1 /test cases/common | |
| parent | ea678ed82938ceac00682b2695b57193d36b71b4 (diff) | |
| download | meson-d37d649b08b832d52fa684bc0506829fb40d5261.tar.gz | |
Make all Meson level options overridable per subproject.
Diffstat (limited to 'test cases/common')
4 files changed, 8 insertions, 4 deletions
diff --git a/test cases/common/40 options/meson.build b/test cases/common/40 options/meson.build index de4a7d50d..ed7668fde 100644 --- a/test cases/common/40 options/meson.build +++ b/test cases/common/40 options/meson.build @@ -18,7 +18,7 @@ if get_option('array_opt') != ['one', 'two'] endif # If the default changes, update test cases/unit/13 reconfigure -if get_option('b_lto') != false +if get_option('b_pch') != true error('Incorrect value in base option.') endif @@ -30,8 +30,10 @@ if get_option('integer_opt') != 3 error('Incorrect value in integer option.') endif -if get_option('neg_int_opt') != -3 - error('Incorrect value in negative integer option.') +negint = get_option('neg_int_opt') + +if negint != -3 and negint != -10 + error('Incorrect value @0@ in negative integer option.'.format(negint)) endif if get_option('CaseSenSiTivE') != 'Some CAPS' diff --git a/test cases/common/87 default options/meson.build b/test cases/common/87 default options/meson.build index 51b5cdac9..1b482f1e3 100644 --- a/test cases/common/87 default options/meson.build +++ b/test cases/common/87 default options/meson.build @@ -30,4 +30,4 @@ assert(w_level == '3', 'warning level "' + w_level + '" instead of "3"') # assert(cc.compiles('int foobar;', no_builtin_args : true), 'No_builtin did not disable builtins.') # endif -subproject('sub1') +subproject('sub1', default_options: 'func_test_option=true') diff --git a/test cases/common/87 default options/subprojects/sub1/meson.build b/test cases/common/87 default options/subprojects/sub1/meson.build index de0dc216c..d6f796095 100644 --- a/test cases/common/87 default options/subprojects/sub1/meson.build +++ b/test cases/common/87 default options/subprojects/sub1/meson.build @@ -1,3 +1,4 @@ project('sub1') assert(get_option('test_option') == false) +assert(get_option('func_test_option') == true) diff --git a/test cases/common/87 default options/subprojects/sub1/meson_options.txt b/test cases/common/87 default options/subprojects/sub1/meson_options.txt index fc96f5e09..37ce4d4bb 100644 --- a/test cases/common/87 default options/subprojects/sub1/meson_options.txt +++ b/test cases/common/87 default options/subprojects/sub1/meson_options.txt @@ -1 +1,2 @@ option('test_option', type : 'boolean', value : true, description : 'Test option. Superproject overrides default to "false"') +option('func_test_option', type : 'boolean', value : false, description : 'Test option. Superproject overrides default to "true"') |