Avoid accidental library name matches when parsing ldd output.

* Use a single pattern that matches against potentially complete paths.
* Extract filename only afterwards on platforms where it is necessary.
* Match patterns against complete words in ldd output instead of searching
  for them inside the lines - this avoids unintentional matches without
  complexity of negative lookbehinds and negative lookaheads.

Fixes issue #208.

3 files changed, 104 insertions, 0 deletions

diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 6b705f5d..279addfe 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -229,6 +229,7 @@ CHECKDOCS =
 endif
 
 PYTESTS = \
+	test_shlibs.py \
 	test_sourcescanner.py \
 	test_transformer.py
 
diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
index f8b794d2..3458c32e 100644
--- a/tests/scanner/meson.build
+++ b/tests/scanner/meson.build
@@ -3,6 +3,7 @@ scanner_test_env = environment()
 scanner_test_env.append('PYTHONPATH', join_paths(meson.current_build_dir(), '../../'))
 
 scanner_test_files = [
+  'test_shlibs.py',
   'test_sourcescanner.py',
   'test_transformer.py'
 ]
diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
new file mode 100644
index 00000000..c3e28892
--- /dev/null
+++ b/tests/scanner/test_shlibs.py
@@ -0,0 +1,102 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import unittest
+
+from giscanner.shlibs import resolve_from_ldd_output
+
+
+class TestLddParser(unittest.TestCase):
+
+    def test_resolve_from_ldd_output(self):
+        output = '''\
+            libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)
+            libgtk-3.so.0 => /usr/lib/x86_64-linux-gnu/libgtk-3.so.0 (0x00007fbe12462000)
+            libgdk-3.so.0 => /usr/lib/x86_64-linux-gnu/libgdk-3.so.0 (0x00007fbe1216c000)
+            libpango-1.0.so.0 => /usr/lib/x86_64-linux-gnu/libpango-1.0.so.0 (0x00007fbe11d1a000)
+            libatk-1.0.so.0 => /usr/lib/x86_64-linux-gnu/libatk-1.0.so.0 (0x00007fbe11af4000)'''
+        libraries = ['glib-2.0', 'gtk-3', 'pango-1.0']
+
+        self.assertEqual(
+            ['libglib-2.0.so.0', 'libgtk-3.so.0', 'libpango-1.0.so.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_unresolved_library(self):
+        output = ''
+        libraries = ['foo']
+
+        with self.assertRaises(SystemExit, msg='can\'t resolve libraries to shared libraries: foo'):
+            resolve_from_ldd_output(libraries, output)
+
+    def test_prefixed_library_name(self):
+        output = '''\
+           /usr/lib/liblibX.so
+           /usr/lib/libX.so'''
+
+        self.assertEqual(
+            ['/usr/lib/libX.so'],
+            resolve_from_ldd_output(['X'], output))
+        self.assertEqual(
+            ['/usr/lib/liblibX.so'],
+            resolve_from_ldd_output(['libX'], output))
+
+    def test_suffixed_library_name(self):
+        output = '''\
+            libpangocairo.so.0 => /usr/lib/x86_64-linux-gnu/libpangocairo.so.0 (0x00)
+            libpangoft2.so.0 => /usr/lib/x86_64-linux-gnu/libpangoft2.so.0 (0x00)
+            libpango.so.0 => /usr/lib/x86_64-linux-gnu/libpango.so.0 (0x00)'''
+        libraries = ['pango']
+
+        self.assertEqual(
+            ['libpango.so.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_header_is_ignored(self):
+        output = '''/tmp-introspection/libfoo.so.999:
+            0000000000000000 0000000000000000 rlib  0    3   0      /usr/local/lib/libfoo.so.1'''
+        libraries = ['foo']
+
+        self.assertEqual(
+            ['/usr/local/lib/libfoo.so.1'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_executable_path_includes_library_name(self):
+        """
+        Regression test for https://gitlab.gnome.org/GNOME/gobject-introspection/issues/208
+        """
+        output = '''/usr/ports/pobj/libgepub-0.6.0/build-amd64/tmp-introspectnxmyodg1/Gepub-0.6:
+            Start            End              Type  Open Ref GrpRef Name
+            00001066c8400000 00001066c8605000 exe   2    0   0      /usr/ports/pobj/libgepub-0.6.0/build-amd64/tmp-introspectnxmyodg1/Gepub-0.6
+            000010690019c000 00001069003a8000 rlib  0    1   0      /usr/local/lib/libgepub-0.6.so.0.0'''
+        libraries = ['gepub-0.6']
+
+        self.assertEqual(
+            ['/usr/local/lib/libgepub-0.6.so.0.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_library_path_includes_library_name(self):
+        output = '''/usr/ports/pobj/gnome-music-3.28.1/build-amd64/tmp-introspectuz5xaun3/Gd-1.0:
+            Start            End              Type  Open Ref GrpRef Name
+            0000070e40f00000 0000070e41105000 exe   2    0   0      /usr/ports/pobj/gnome-music-3.28.1/build-amd64/tmp-introspectuz5xaun3/Gd-1.0
+            00000710f9b39000 00000710f9d51000 rlib  0    1   0      /usr/ports/pobj/gnome-music-3.28.1/build-amd64/subprojects/libgd/libgd/libgd.so'''
+        libraries = ['gd']
+
+        self.assertEqual(
+            ['/usr/ports/pobj/gnome-music-3.28.1/build-amd64/subprojects/libgd/libgd/libgd.so'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_basename(self):
+        output = '''/usr/lib/libfoo.so'''
+
+        self.assertEqual(
+            ['/usr/lib/libfoo.so'],
+            resolve_from_ldd_output(['foo'], output, basename=False))
+        self.assertEqual(
+            ['libfoo.so'],
+            resolve_from_ldd_output(['foo'], output, basename=True))
+
+
+if __name__ == '__main__':
+    unittest.main()