From a97fd83c8bfb428c5bc8fc82f08bc1180b4b67ca Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 18 Jun 2025 12:14:32 +0200 Subject: unittests: do not use coredata.set_option optstore is able to set buildtype correctly. Signed-off-by: Paolo Bonzini --- mesonbuild/coredata.py | 10 ---------- unittests/datatests.py | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 8af2bfc13..39e491792 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -412,16 +412,6 @@ class CoreData: def set_from_configure_command(self, options: SharedCMDOptions) -> bool: return self.optstore.set_from_configure_command(options.cmd_line_options) - def set_option(self, key: OptionKey, value, first_invocation: bool = False) -> bool: - dirty = False - try: - changed = self.optstore.set_option(key, value, first_invocation) - except KeyError: - raise MesonException(f'Tried to set unknown builtin option {str(key)}') - dirty |= changed - - return dirty - def clear_cache(self) -> None: self.deps.host.clear() self.deps.build.clear() diff --git a/unittests/datatests.py b/unittests/datatests.py index 3fb6068d4..58b74188e 100644 --- a/unittests/datatests.py +++ b/unittests/datatests.py @@ -167,7 +167,7 @@ class DataTests(unittest.TestCase): debug = False else: raise RuntimeError(f'Invalid debug value {debug!r} in row:\n{m.group()}') - env.coredata.set_option(OptionKey('buildtype'), buildtype) + env.coredata.optstore.set_option(OptionKey('buildtype'), buildtype) self.assertEqual(env.coredata.optstore.get_value_for('buildtype'), buildtype) self.assertEqual(env.coredata.optstore.get_value_for('optimization'), opt) self.assertEqual(env.coredata.optstore.get_value_for('debug'), debug) -- cgit v1.2.3