From 4b1c1d83c88853a6be99b53e4d27c414b7b36137 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 14 Sep 2020 10:07:15 -0700 Subject: machinefiles: Allow keys to be stored case insensitive This is required to make the various keys in the [user options] section work the same as they do in the meson_options.txt file, where we don't have any rules about case sensitivity. There is some risk here. Someone may be relying on this lower by default behavior, and this could break their machine files. Fixes #7731 --- test cases/common/43 options/meson.build | 8 ++++++++ test cases/common/43 options/meson_options.txt | 2 ++ 2 files changed, 10 insertions(+) (limited to 'test cases/common') diff --git a/test cases/common/43 options/meson.build b/test cases/common/43 options/meson.build index 08c5cca..2eccef7 100644 --- a/test cases/common/43 options/meson.build +++ b/test cases/common/43 options/meson.build @@ -34,4 +34,12 @@ if get_option('neg_int_opt') != -3 error('Incorrect value in negative integer option.') endif +if get_option('CaseSenSiTivE') != 'Some CAPS' + error('Incorrect value in mixed caps option.') +endif + +if get_option('CASESENSITIVE') != 'ALL CAPS' + error('Incorrect value in all caps option.') +endif + assert(get_option('wrap_mode') == 'default', 'Wrap mode option is broken.') diff --git a/test cases/common/43 options/meson_options.txt b/test cases/common/43 options/meson_options.txt index db649de..8067eae 100644 --- a/test cases/common/43 options/meson_options.txt +++ b/test cases/common/43 options/meson_options.txt @@ -5,3 +5,5 @@ option('array_opt', type : 'array', choices : ['one', 'two', 'three'], value : [ option('free_array_opt', type : 'array') option('integer_opt', type : 'integer', min : 0, max : -(-5), value : 3) option('neg' + '_' + 'int' + '_' + 'opt', type : 'integer', min : -5, max : 5, value : -3) +option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitaliziation') +option('CASESENSITIVE', type : 'string', value: 'ALL CAPS', description : 'An option with all caps') -- cgit v1.1