aboutsummaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2023-08-18 09:56:13 -0400
committerXavier Claessens <xclaesse@gmail.com>2023-09-18 13:51:27 -0400
commitf1c35b561f80174ae1ea936da282d8736c19e247 (patch)
tree81efdf677e76fc32e7531470caf80235fa04d24b /unittests
parent6a56f6d98fb7806a59967b0df3ede26544eac4a4 (diff)
downloadmeson-f1c35b561f80174ae1ea936da282d8736c19e247.zip
meson-f1c35b561f80174ae1ea936da282d8736c19e247.tar.gz
meson-f1c35b561f80174ae1ea936da282d8736c19e247.tar.bz2
pkgconfig: Set PKG_CONFIG in env for devenv and g-ir-scanner
Diffstat (limited to 'unittests')
-rw-r--r--unittests/linuxliketests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 8760fae..7d99d8b 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -45,7 +45,7 @@ from mesonbuild.compilers.c import AppleClangCCompiler
from mesonbuild.compilers.cpp import AppleClangCPPCompiler
from mesonbuild.compilers.objc import AppleClangObjCCompiler
from mesonbuild.compilers.objcpp import AppleClangObjCPPCompiler
-from mesonbuild.dependencies.pkgconfig import PkgConfigDependency, PkgConfigCLI
+from mesonbuild.dependencies.pkgconfig import PkgConfigDependency, PkgConfigCLI, PkgConfigInterface
import mesonbuild.modules.pkgconfig
PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config')
@@ -1169,7 +1169,7 @@ class LinuxlikeTests(BasePlatformTests):
# Regression test: This used to modify the value of `pkg_config_path`
# option, adding the meson-uninstalled directory to it.
- PkgConfigCLI.setup_env({}, env, MachineChoice.HOST, uninstalled=True)
+ PkgConfigInterface.setup_env({}, env, MachineChoice.HOST, uninstalled=True)
pkg_config_path = env.coredata.options[OptionKey('pkg_config_path')].value
self.assertEqual(pkg_config_path, [pkg_dir])