summaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2018-11-29 16:19:01 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-01-06 12:19:29 +0100
commitb11df88395a6543ab1ea9354050f0b885959854a (patch)
treee0ef413a7b68585a018947a905178cd29a37fe7c /run_unittests.py
parentb034f52656c19f378fc144abd9087e7526b1e27f (diff)
downloadmeson-b11df88395a6543ab1ea9354050f0b885959854a.tar.gz
Documentation and unit test update
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 1977fe0c1..db88c9b05 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1224,7 +1224,10 @@ class BasePlatformTests(unittest.TestCase):
self.assertEqual(len(pathlist1), len(pathlist2))
worklist = list(zip(pathlist1, pathlist2))
for i in worklist:
- self.assertPathEqual(i[0], i[1])
+ if i[0] == None:
+ self.assertEqual(i[0], i[1])
+ else:
+ self.assertPathEqual(i[0], i[1])
def assertPathBasenameEqual(self, path, basename):
msg = '{!r} does not end with {!r}'.format(path, basename)
@@ -1510,8 +1513,8 @@ class AllPlatformTests(BasePlatformTests):
intro = intro[::-1]
self.assertPathListEqual(intro[0]['install_filename'], ['/usr/include/diff.h', '/usr/bin/diff.sh'])
self.assertPathListEqual(intro[1]['install_filename'], ['/opt/same.h', '/opt/same.sh'])
- self.assertPathListEqual(intro[2]['install_filename'], ['/usr/include/first.h'])
- self.assertPathListEqual(intro[3]['install_filename'], ['/usr/bin/second.sh'])
+ self.assertPathListEqual(intro[2]['install_filename'], ['/usr/include/first.h', None])
+ self.assertPathListEqual(intro[3]['install_filename'], [None, '/usr/bin/second.sh'])
def test_uninstall(self):
exename = os.path.join(self.installdir, 'usr/bin/prog' + exe_suffix)
@@ -3213,7 +3216,7 @@ recommended as it is not supported on some platforms''')
self.assertListEqual(res['buildsystem_files'], ['meson.build', 'sharedlib/meson.build', 'staticlib/meson.build'])
# Check dependencies
- dependencies_to_find = ['zlib']
+ dependencies_to_find = ['threads']
for i in res['dependencies']:
assertKeyTypes(dependencies_typelist, i)
if i['name'] in dependencies_to_find: