From 8efd9400922f6f8eb876f9ef8d0042679d836c90 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 22 Mar 2018 16:40:58 -0400 Subject: pkgconfig generator: Add required version --- run_unittests.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 94e39c8..0c84475 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2266,11 +2266,11 @@ class LinuxlikeTests(BasePlatformTests): os.environ['PKG_CONFIG_LIBDIR'] = os.pathsep.join([privatedir1, privatedir2]) cmd = ['pkg-config', 'dependency-test'] - out = self._run(cmd + ['--print-requires']).strip().split() + out = self._run(cmd + ['--print-requires']).strip().split('\n') self.assertEqual(sorted(out), sorted(['libexposed'])) - out = self._run(cmd + ['--print-requires-private']).strip().split() - self.assertEqual(sorted(out), sorted(['libfoo'])) + out = self._run(cmd + ['--print-requires-private']).strip().split('\n') + self.assertEqual(sorted(out), sorted(['libfoo >= 1.0'])) out = self._run(cmd + ['--cflags-only-other']).strip().split() self.assertEqual(sorted(out), sorted(['-pthread', '-DCUSTOM'])) @@ -2286,12 +2286,12 @@ class LinuxlikeTests(BasePlatformTests): '-lfoo'])) cmd = ['pkg-config', 'requires-test'] - out = self._run(cmd + ['--print-requires']).strip().split() - self.assertEqual(sorted(out), sorted(['libexposed', 'libfoo', 'libhello'])) + out = self._run(cmd + ['--print-requires']).strip().split('\n') + self.assertEqual(sorted(out), sorted(['libexposed', 'libfoo >= 1.0', 'libhello'])) cmd = ['pkg-config', 'requires-private-test'] - out = self._run(cmd + ['--print-requires-private']).strip().split() - self.assertEqual(sorted(out), sorted(['libexposed', 'libfoo', 'libhello'])) + out = self._run(cmd + ['--print-requires-private']).strip().split('\n') + self.assertEqual(sorted(out), sorted(['libexposed', 'libfoo >= 1.0', 'libhello'])) def test_pkg_unfound(self): testdir = os.path.join(self.unit_test_dir, '22 unfound pkgconfig') -- cgit v1.1