diff options
| -rw-r--r-- | mesonbuild/options.py | 10 | ||||
| -rw-r--r-- | unittests/optiontests.py | 23 |
2 files changed, 0 insertions, 33 deletions
diff --git a/mesonbuild/options.py b/mesonbuild/options.py index d7997ffcc..3a3e5e9b7 100644 --- a/mesonbuild/options.py +++ b/mesonbuild/options.py @@ -1036,16 +1036,6 @@ class OptionStore: o = o.as_root() return self.set_value(o, new_value) - def set_subproject_options(self, subproject: str, - spcall_default_options: str, - project_default_options: str) -> None: - for o in itertools.chain(spcall_default_options, project_default_options): - keystr, valstr = o.split('=', 1) - assert ':' not in keystr - keystr = f'{subproject}:{keystr}' - if keystr not in self.augments: - self.augments[keystr] = valstr - def set_from_configure_command(self, D_args: T.List[str], U_args: T.List[str]) -> bool: dirty = False D_args = [] if D_args is None else D_args diff --git a/unittests/optiontests.py b/unittests/optiontests.py index 3db769d66..274a74a6e 100644 --- a/unittests/optiontests.py +++ b/unittests/optiontests.py @@ -182,29 +182,6 @@ class OptionTests(unittest.TestCase): self.assertEqual(optstore.get_value_for(name), top_value) self.assertEqual(optstore.get_value_for(name, sub_name), set_value) - def test_subproject_call_options(self): - optstore = OptionStore(False) - name = 'cpp_std' - default_value = 'c++11' - override_value = 'c++14' - unused_value = 'c++20' - subproject = 'sub' - - co = UserComboOption(name, - 'C++ language standard to use', - default_value, - choices=['c++98', 'c++11', 'c++14', 'c++17', 'c++20', 'c++23'], - ) - optstore.add_system_option(name, co) - optstore.set_subproject_options(subproject, [f'cpp_std={override_value}'], [f'cpp_std={unused_value}']) - self.assertEqual(optstore.get_value_for(name), default_value) - self.assertEqual(optstore.get_value_for(name, subproject), override_value) - - # Trying again should change nothing - optstore.set_subproject_options(subproject, [f'cpp_std={unused_value}'], [f'cpp_std={unused_value}']) - self.assertEqual(optstore.get_value_for(name), default_value) - self.assertEqual(optstore.get_value_for(name, subproject), override_value) - def test_b_default(self): optstore = OptionStore(False) value = optstore.get_default_for_b_option(OptionKey('b_vscrt')) |