aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-03-08 15:08:07 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-03-09 00:39:13 +0200
commit3a57e5177ba949cff5f971f7338a1c75a2724ac2 (patch)
treec856e48c4fa421b5f0a87508864b412503cc99f0
parent44ff3e6c7de0db188284cc834b304e7b0e960d00 (diff)
downloadmeson-3a57e5177ba949cff5f971f7338a1c75a2724ac2.zip
meson-3a57e5177ba949cff5f971f7338a1c75a2724ac2.tar.gz
meson-3a57e5177ba949cff5f971f7338a1c75a2724ac2.tar.bz2
Fix introspection of symlink targets on macOS.
-rwxr-xr-xrun_unittests.py46
1 files changed, 33 insertions, 13 deletions
diff --git a/run_unittests.py b/run_unittests.py
index c9b7563..baea70e 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5792,24 +5792,44 @@ class LinuxlikeTests(BasePlatformTests):
install = self.introspect('--installed')
install = {os.path.basename(k): v for k, v in install.items()}
- self.assertDictEqual(install, {
- 'libmodule.so': '/usr/lib/libmodule.so',
- 'libnoversion.so': '/usr/lib/libnoversion.so',
- 'libonlysoversion.so': '/usr/lib/libonlysoversion.so',
- 'libonlysoversion.so.5': '/usr/lib/libonlysoversion.so.5',
- 'libonlyversion.so': '/usr/lib/libonlyversion.so',
- 'libonlyversion.so.1': '/usr/lib/libonlyversion.so.1',
- 'libonlyversion.so.1.4.5': '/usr/lib/libonlyversion.so.1.4.5',
- 'libsome.so': '/usr/lib/libsome.so',
- 'libsome.so.0': '/usr/lib/libsome.so.0',
- 'libsome.so.1.2.3': '/usr/lib/libsome.so.1.2.3',
- })
+ print(install)
+ if is_osx():
+ the_truth = {
+ 'libmodule.dylib': '/usr/lib/libmodule.dylib',
+ 'libnoversion.dylib': '/usr/lib/libnoversion.dylib',
+ 'libonlysoversion.5.dylib': '/usr/lib/libonlysoversion.5.dylib',
+ 'libonlysoversion.dylib': '/usr/lib/libonlysoversion.dylib',
+ 'libonlyversion.1.dylib': '/usr/lib/libonlyversion.1.dylib',
+ 'libonlyversion.dylib': '/usr/lib/libonlyversion.dylib',
+ 'libsome.0.dylib': '/usr/lib/libsome.0.dylib',
+ 'libsome.dylib': '/usr/lib/libsome.dylib',
+ }
+ the_truth_2 = {'/usr/lib/libsome.dylib',
+ '/usr/lib/libsome.0.dylib',
+ }
+ else:
+ the_truth = {
+ 'libmodule.so': '/usr/lib/libmodule.so',
+ 'libnoversion.so': '/usr/lib/libnoversion.so',
+ 'libonlysoversion.so': '/usr/lib/libonlysoversion.so',
+ 'libonlysoversion.so.5': '/usr/lib/libonlysoversion.so.5',
+ 'libonlyversion.so': '/usr/lib/libonlyversion.so',
+ 'libonlyversion.so.1': '/usr/lib/libonlyversion.so.1',
+ 'libonlyversion.so.1.4.5': '/usr/lib/libonlyversion.so.1.4.5',
+ 'libsome.so': '/usr/lib/libsome.so',
+ 'libsome.so.0': '/usr/lib/libsome.so.0',
+ 'libsome.so.1.2.3': '/usr/lib/libsome.so.1.2.3',
+ }
+ the_truth_2 = {'/usr/lib/libsome.so',
+ '/usr/lib/libsome.so.0',
+ '/usr/lib/libsome.so.1.2.3'}
+ self.assertDictEqual(install, the_truth)
targets = self.introspect('--targets')
for t in targets:
if t['name'] != 'some':
continue
- self.assertSetEqual({'/usr/lib/libsome.so', '/usr/lib/libsome.so.0', '/usr/lib/libsome.so.1.2.3'}, set(t['install_filename']))
+ self.assertSetEqual(the_truth_2, set(t['install_filename']))
def test_build_rpath(self):
if is_cygwin():