aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorNiklas Claesson <nicke.claesson@gmail.com>2019-03-11 19:56:52 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-03-11 20:56:52 +0200
commitdd2c44cdf6f8ed8a969d0666cafb08aaf78a919d (patch)
treea6057cb899b43c55a820291c93dd62d61e2e0a69 /run_unittests.py
parentfaf3581df6af59c04e66378da129bb2039beab8a (diff)
downloadmeson-dd2c44cdf6f8ed8a969d0666cafb08aaf78a919d.zip
meson-dd2c44cdf6f8ed8a969d0666cafb08aaf78a919d.tar.gz
meson-dd2c44cdf6f8ed8a969d0666cafb08aaf78a919d.tar.bz2
Add static as keyword to find_library
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 5087414..5de69f6 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -700,16 +700,16 @@ class InternalTests(unittest.TestCase):
def _test_all_naming(self, cc, env, patterns, platform):
shr = patterns[platform]['shared']
stc = patterns[platform]['static']
+ shrstc = shr + tuple([x for x in stc if x not in shr])
+ stcshr = stc + tuple([x for x in shr if x not in stc])
p = cc.get_library_naming(env, 'shared')
self.assertEqual(p, shr)
p = cc.get_library_naming(env, 'static')
self.assertEqual(p, stc)
p = cc.get_library_naming(env, 'static-shared')
- self.assertEqual(p, stc + shr)
+ self.assertEqual(p, stcshr)
p = cc.get_library_naming(env, 'shared-static')
- self.assertEqual(p, shr + stc)
- p = cc.get_library_naming(env, 'default')
- self.assertEqual(p, shr + stc)
+ self.assertEqual(p, shrstc)
# Test find library by mocking up openbsd
if platform != 'openbsd':
return
@@ -724,7 +724,7 @@ class InternalTests(unittest.TestCase):
f.write('')
with open(os.path.join(tmpdir, 'libfoo.so.70.0.so.1'), 'w') as f:
f.write('')
- found = cc.find_library_real('foo', env, [tmpdir], '', 'default')
+ found = cc.find_library_real('foo', env, [tmpdir], '', 'shared-static')
self.assertEqual(os.path.basename(found[0]), 'libfoo.so.54.0')
def test_find_library_patterns(self):