diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-01-19 11:32:14 -0500 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-01-19 13:45:14 -0500 |
commit | 6e2e94c6452c12af224515e70aa88a63fb5adc65 (patch) | |
tree | 22df3360a0cd4d34a5129b99afe6c4c095eb9647 /run_unittests.py | |
parent | ec37f625c7ffd5b3470ac6990f856f485c04af5e (diff) | |
download | meson-6e2e94c6452c12af224515e70aa88a63fb5adc65.zip meson-6e2e94c6452c12af224515e70aa88a63fb5adc65.tar.gz meson-6e2e94c6452c12af224515e70aa88a63fb5adc65.tar.bz2 |
pkgconfig: Also ignore not found deps passed directly to pc generator
Currently only not found deps implicitly pulled from a Library object
are ignored. We should also ignore not found deps passed directly to
generate() method.
This makes the unit testing more complicated because libfoo pkgconfig
dependency cannot be found when generated from the within the same
meson.build.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index 536c0f9..7abbe6c 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2067,11 +2067,17 @@ class LinuxlikeTests(BasePlatformTests): ''' Test that generated pkg-config files correctly handle dependencies ''' - testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen') self.init(testdir) + privatedir1 = self.privatedir - os.environ['PKG_CONFIG_LIBDIR'] = self.privatedir + self.new_builddir() + os.environ['PKG_CONFIG_LIBDIR'] = privatedir1 + testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen', 'dependencies') + self.init(testdir) + privatedir2 = self.privatedir + + os.environ['PKG_CONFIG_LIBDIR'] = os.pathsep.join([privatedir1, privatedir2]) cmd = ['pkg-config', 'dependency-test'] out = self._run(cmd + ['--print-requires']).strip().split() |