aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-09-07 18:56:17 +0200
committerXavier Claessens <xclaesse@gmail.com>2021-09-07 14:18:58 -0400
commit0fcd696b1e0c6ff9ca462ac2f8e0d497bf11e2c5 (patch)
treeb33a5861c307a14ba2395f3d8b73f8109c037dea
parent516c871beca90caa2a1433579e6450f5a6c65817 (diff)
downloadmeson-0fcd696b1e0c6ff9ca462ac2f8e0d497bf11e2c5.zip
meson-0fcd696b1e0c6ff9ca462ac2f8e0d497bf11e2c5.tar.gz
meson-0fcd696b1e0c6ff9ca462ac2f8e0d497bf11e2c5.tar.bz2
unittests: test external dependency in summary
This requires a bit of extra code because the version might change, but otherwise it fits in the existing AllPlatformTests.test_summary testcase Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--test cases/unit/72 summary/meson.build1
-rw-r--r--unittests/allplatformstests.py11
2 files changed, 9 insertions, 3 deletions
diff --git a/test cases/unit/72 summary/meson.build b/test cases/unit/72 summary/meson.build
index 4205d6f..6e0f69a 100644
--- a/test cases/unit/72 summary/meson.build
+++ b/test cases/unit/72 summary/meson.build
@@ -13,6 +13,7 @@ summary({'Some boolean': false,
summary({'missing prog': find_program('xyzzy', required: false),
'existing prog': import('python').find_installation(),
'missing dep': dependency('', required: false),
+ 'external dep': dependency('zlib', required: false),
'internal dep': declare_dependency(),
}, section: 'Stuff')
summary('A number', 1, section: 'Configuration')
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 6ead45e..c420340 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -3119,6 +3119,7 @@ class AllPlatformTests(BasePlatformTests):
missing prog : NO
existing prog : ''' + sys.executable + '''
missing dep : NO
+ external dep : YES 1.2.3
internal dep : YES
Plugins
@@ -3142,9 +3143,13 @@ class AllPlatformTests(BasePlatformTests):
if sys.version_info < (3, 7, 0):
# Dictionary order is not stable in Python <3.7, so sort the lines
# while comparing
- self.assertEqual(sorted(expected_lines), sorted(out_lines))
- else:
- self.assertEqual(expected_lines, out_lines)
+ expected_lines = sorted(expected_lines)
+ out_lines = sorted(out_lines)
+ for e, o in zip(expected_lines, out_lines):
+ if e.startswith(' external dep'):
+ self.assertRegex(o, r'^ external dep : (YES [0-9.]*|NO)$')
+ else:
+ self.assertEqual(o, e)
def test_meson_compile(self):
"""Test the meson compile command."""