From 7e0767bae41eb693993d03bfb75abca1171959c5 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 18 Jun 2025 12:08:02 +0200 Subject: compilers: do not use coredata.set_options Signed-off-by: Paolo Bonzini --- unittests/linuxliketests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'unittests') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index ad6d0ecea..c9ba37118 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1144,7 +1144,7 @@ class LinuxlikeTests(BasePlatformTests): self.assertPathExists(os.path.join(pkg_dir, 'librelativepath.pc')) env = get_fake_env(testdir, self.builddir, self.prefix) - env.coredata.set_options({OptionKey('pkg_config_path'): pkg_dir}, subproject='') + env.coredata.optstore.set_option(OptionKey('pkg_config_path'), pkg_dir) kwargs = {'required': True, 'silent': True} relative_path_dep = PkgConfigDependency('librelativepath', env, kwargs) self.assertTrue(relative_path_dep.found()) @@ -1160,7 +1160,7 @@ class LinuxlikeTests(BasePlatformTests): pkg_dir = os.path.join(testdir, 'pkgconfig') env = get_fake_env(testdir, self.builddir, self.prefix) - env.coredata.set_options({OptionKey('pkg_config_path'): pkg_dir}, subproject='') + env.coredata.optstore.set_option(OptionKey('pkg_config_path'), pkg_dir) # Regression test: This used to modify the value of `pkg_config_path` # option, adding the meson-uninstalled directory to it. @@ -1195,8 +1195,7 @@ class LinuxlikeTests(BasePlatformTests): env = get_fake_env(testdir, self.builddir, self.prefix) - env.coredata.set_options({OptionKey('pkg_config_path'): external_pkg_config_path_dir}, - subproject='') + env.coredata.optstore.set_option(OptionKey('pkg_config_path'), external_pkg_config_path_dir) newEnv = PkgConfigInterface.setup_env({}, env, MachineChoice.HOST, uninstalled=True) -- cgit v1.2.3