diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-09-30 17:33:02 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2025-10-01 00:36:07 +0530 |
| commit | c0a5e9293209f465ab114ae0fcd92de640ef48a6 (patch) | |
| tree | cc9fd43fa62aac2100ba6a17679b0743a1fce96e /unittests | |
| parent | 62a5e3a82a617da2bfdf82664db7074f0dcc9d5a (diff) | |
| download | meson-c0a5e9293209f465ab114ae0fcd92de640ef48a6.tar.gz | |
options: ensure pending subproject options are validated
Boolean options need to be translated from string "true" to True and
so on, otherwise we will get an assertion later when trying to set the
value:
```
Traceback (most recent call last):
File "meson.git/mesonbuild/mesonmain.py", line 193, in run
return options.run_func(options)
~~~~~~~~~~~~~~~~^^^^^^^^^
File "meson.git/mesonbuild/msetup.py", line 395, in run
app.generate()
~~~~~~~~~~~~^^
File "meson.git/mesonbuild/msetup.py", line 194, in generate
return self._generate(env, capture, vslite_ctx)
~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^
File "meson.git/mesonbuild/msetup.py", line 282, in _generate
captured_compile_args = intr.backend.generate(capture, vslite_ctx)
File "meson.git/mesonbuild/backend/ninjabackend.py", line 647, in generate
self.generate_target(t)
~~~~~~~~~~~~~~~~~~~~^^^
File "meson.git/mesonbuild/backend/ninjabackend.py", line 1099, in generate_target
elem = self.generate_link(target, outname, final_obj_list, linker, pch_objects, stdlib_args=stdlib_args)
File "meson.git/mesonbuild/backend/ninjabackend.py", line 3632, in generate_link
base_link_args = compilers.get_base_link_args(target,
linker,
self.environment)
File "meson.git/mesonbuild/compilers/compilers.py", line 405, in get_base_link_args
option_enabled(linker.base_options, target, env, 'b_lundef')):
~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "meson.git/mesonbuild/compilers/compilers.py", line 234, in option_enabled
assert isinstance(ret, bool), 'must return bool' # could also be str
~~~~~~~~~~^^^^^^^^^^^
AssertionError: must return bool
```
This assertion is being hit because the vo-aacenc wrap sets
`b_lundef=true` in `default_options:` in `project()`, which ends up in
`self.augments` when the project is being invoked as a subproject.
The fix is to use set_option even for pending subproject options. This
will follow this path:
new_value = opt.validate_value(new_value)
old_value = self.augments.get(key, opt.value)
self.augments[key] = new_value
This regressed in 2bafe7dc403b92c7b1f7bbad62dd8533e90f8523.
First noticed at: https://github.com/mesonbuild/wrapdb/actions/runs/18123699172/job/51573947286?pr=2425
[Commit message by Nirbheek Chauhan <nirbheek@centricular.com>]
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/optiontests.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/unittests/optiontests.py b/unittests/optiontests.py index 8f49a804e..7273ecf47 100644 --- a/unittests/optiontests.py +++ b/unittests/optiontests.py @@ -474,3 +474,21 @@ class OptionTests(unittest.TestCase): 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) |