mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

oeqa: reproducible: Use subTest for packages

Browse Source 
Runs each package class reproducibility test in a separate sub-test.
This allows the other sub tests to still run in the event that one
fails.

(From OE-Core rev: f0095e6c1b915e1e6ded111f4bf77fff0362e29a)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2019-08-27 14:33:46 -05:00
committed by Richard Purdie
parent 8282ec4bd0
commit 569687083f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/reproducible.py
+11 -10
View File
@@ -134,7 +134,7 @@ class ReproducibleTests(OESelftestTestCase):
reproducible_tmp = os.path.join(self.topdir, 'reproducible', 'tmp')
if os.path.exists(reproducible_tmp):
bb.utils.remove(reproducible_tmp)
bb.utils.remove(reproducible_tmp, recurse=True)
# Perform another build. This build should *not* share sstate or pull
# from any mirrors, but sharing a DL_DIR is fine
@@ -150,18 +150,19 @@ class ReproducibleTests(OESelftestTestCase):
# kept after the build so it can be diffed for debugging.
for c in self.package_classes:
package_class = 'package_' + c
with self.subTest(package_class=c):
package_class = 'package_' + c
deploy_reference = vars_reference['DEPLOY_DIR_' + c.upper()]
deploy_test = vars_test['DEPLOY_DIR_' + c.upper()]
deploy_reference = vars_reference['DEPLOY_DIR_' + c.upper()]
deploy_test = vars_test['DEPLOY_DIR_' + c.upper()]
result = self.compare_packages(deploy_reference, deploy_test, diffutils_sysroot)
result = self.compare_packages(deploy_reference, deploy_test, diffutils_sysroot)
self.logger.info('Reproducibility summary for %s: %s' % (c, result))
self.logger.info('Reproducibility summary for %s: %s' % (c, result))
self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total))
self.append_to_log('\n'.join("%s: %s" % (r.status, r.test) for r in result.total))
if result.missing or result.different:
self.fail("The following %s packages are missing or different: %s" %
(c, ' '.join(r.test for r in (result.missing + result.different))))
if result.missing or result.different:
self.fail("The following %s packages are missing or different: %s" %
(c, ' '.join(r.test for r in (result.missing + result.different))))