aboutsummaryrefslogtreecommitdiff
path: root/unittests
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-11-20 17:26:44 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-12-04 17:56:03 -0500
commitda23630a97a2999faef42a68a631105a3556054c (patch)
tree83d305a75ba4b4c6029f0fdcc0295eef96f493e3 /unittests
parent9074ad93c6675cdb603b85d85a8090100058f81b (diff)
downloadmeson-da23630a97a2999faef42a68a631105a3556054c.zip
meson-da23630a97a2999faef42a68a631105a3556054c.tar.gz
meson-da23630a97a2999faef42a68a631105a3556054c.tar.bz2
refactor pkg-config dependency to allow statically finding the program
The pkg-config dependency class has some interesting logic for finding a good pkg-config that will be used for dependency lookups. We sometimes need to use it, though, outside of the class. Make that possible.
Diffstat (limited to 'unittests')
-rw-r--r--unittests/linuxliketests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 1e530b0..50c6b62 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -173,7 +173,7 @@ class LinuxlikeTests(BasePlatformTests):
self.assertEqual(libhello_nolib.get_compile_args(), [])
self.assertEqual(libhello_nolib.get_pkgconfig_variable('foo', [], None), 'bar')
self.assertEqual(libhello_nolib.get_pkgconfig_variable('prefix', [], None), self.prefix)
- if version_compare(libhello_nolib.check_pkgconfig(libhello_nolib.pkgbin),">=0.29.1"):
+ if version_compare(PkgConfigDependency.check_pkgconfig(env, libhello_nolib.pkgbin),">=0.29.1"):
self.assertEqual(libhello_nolib.get_pkgconfig_variable('escaped_var', [], None), r'hello\ world')
self.assertEqual(libhello_nolib.get_pkgconfig_variable('unescaped_var', [], None), 'hello world')