diff options
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 934e2f4..a3ba973 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -59,7 +59,7 @@ class DependenciesHelper: elif hasattr(obj, 'pcdep'): pcdeps = mesonlib.listify(obj.pcdep) for d in pcdeps: - processed_reqs += d.name + processed_reqs.append(d.name) self.add_version_reqs(d.name, obj.version_reqs) elif isinstance(obj, dependencies.PkgConfigDependency): if obj.found(): diff --git a/run_unittests.py b/run_unittests.py index e0cd1ec..c507a0c 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -456,7 +456,6 @@ class InternalTests(unittest.TestCase): self.assertTrue(False, 'A file without .md suffix in snippets dir: ' + f.name) def test_pkgconfig_module(self): - deps = mesonbuild.modules.pkgconfig.DependenciesHelper("thislib") class Mock: pass @@ -465,9 +464,17 @@ class InternalTests(unittest.TestCase): mock.pcdep = Mock() mock.pcdep.name = "some_name" mock.version_reqs = [] + + # pkgconfig dependency as lib + deps = mesonbuild.modules.pkgconfig.DependenciesHelper("thislib") deps.add_pub_libs([mock]) self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name") + # pkgconfig dependency as requires + deps = mesonbuild.modules.pkgconfig.DependenciesHelper("thislib") + deps.add_pub_reqs([mock]) + self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name") + class BasePlatformTests(unittest.TestCase): def setUp(self): |