Skip to content

options: Validate option values before adding to augments #15062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

options: Validate option values before adding to augments #15062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions mesonbuild/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,12 +909,10 @@ def add_system_option_internal(self, key: OptionKey, valobj: AnyOptionType) -> N
if key.subproject:
proj_key = key.evolve(subproject=None)
self.add_system_option_internal(proj_key, valobj)
if pval is not None:
self.augments[key] = pval
else:
self.options[key] = valobj
if pval is not None:
self.set_option(key, pval)
if pval is not None:
self.set_option(key, pval)

def add_compiler_option(self, language: str, key: T.Union[OptionKey, str], valobj: AnyOptionType) -> None:
key = self.ensure_and_validate_key(key)
Expand Down
18 changes: 18 additions & 0 deletions unittests/optiontests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,3 +474,21 @@ def test_deprecated_nonstring_value(self):
optstore.set_option(OptionKey(name), True)
value = optstore.get_value(name)
self.assertEqual(value, '1')

def test_pending_augment_validation(self):
name = 'b_lto'
subproject = 'mysubproject'

optstore = OptionStore(False)
prefix = UserStringOption('prefix', 'This is needed by OptionStore', '/usr')
optstore.add_system_option('prefix', prefix)

optstore.initialize_from_top_level_project_call({}, {}, {})
optstore.initialize_from_subproject_call(subproject, {}, {OptionKey(name): 'true'}, {}, {})

bo = UserBooleanOption(name, 'LTO', False)
key = OptionKey(name, subproject=subproject)
optstore.add_system_option(key, bo)
stored_value = optstore.get_value_for(key)
self.assertIsInstance(stored_value, bool)
self.assertTrue(stored_value)
Loading