aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2023-06-06 12:10:35 -0400
committerXavier Claessens <xclaesse@gmail.com>2023-08-03 16:27:52 -0400
commit183e4b8e903c6c4c057d09549e669d6292478a4e (patch)
tree02e0e2306ef78a797d992914c4badd2c34b180ed /run_tests.py
parentf077cb2ee3fba55fc0e1be327ad791c19f3c3b5e (diff)
downloadmeson-183e4b8e903c6c4c057d09549e669d6292478a4e.zip
meson-183e4b8e903c6c4c057d09549e669d6292478a4e.tar.gz
meson-183e4b8e903c6c4c057d09549e669d6292478a4e.tar.bz2
PkgConfigDependency: Move CLI handling into its own abstraction
This makes the code cleaner and will allow to have other implementations in the future.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.py b/run_tests.py
index 66341e4..cf06337 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -36,7 +36,7 @@ import typing as T
from mesonbuild.compilers.c import CCompiler
from mesonbuild.compilers.detect import detect_c_compiler
-from mesonbuild.dependencies.pkgconfig import PkgConfigDependency
+from mesonbuild.dependencies.pkgconfig import PkgConfigCLI
from mesonbuild import mesonlib
from mesonbuild import mesonmain
from mesonbuild import mtest
@@ -302,8 +302,8 @@ def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]:
def clear_meson_configure_class_caches() -> None:
CCompiler.find_library_cache = {}
CCompiler.find_framework_cache = {}
- PkgConfigDependency.pkgbin_cache = {}
- PkgConfigDependency.class_pkgbin = mesonlib.PerMachine(None, None)
+ PkgConfigCLI.pkgbin_cache = {}
+ PkgConfigCLI.class_pkgbin = mesonlib.PerMachine(None, None)
mesonlib.project_meson_versions = collections.defaultdict(str)
def run_configure_inprocess(commandlist: T.List[str], env: T.Optional[T.Dict[str, str]] = None, catch_exception: bool = False) -> T.Tuple[int, str, str]: