From 7c201279cb5e065fa7bf648dc8d75072e1706e3e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 3 Feb 2020 23:39:29 +0000 Subject: oeqa/reproducible: Improve test output and ensure deb+ipk compared Adding newline characters between the packages in the failure output massively improves readability. Also ensure to output ipk failures when there are deb failures by calling self.fail() at the end, else sometimes only partial differences are returned. (From OE-Core rev: 6e2e0480852177db75a6108d77c99c92c4e9950f) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/lib/oeqa/selftest/cases/reproducible.py') diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 04dc46f38a..f6433c9a02 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -185,6 +185,8 @@ class ReproducibleTests(OESelftestTestCase): # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. + fails = [] + for c in self.package_classes: with self.subTest(package_class=c): package_class = 'package_' + c @@ -208,8 +210,11 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.test, '/'.join([save_dir, d.test])) 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)))) + fails.append("The following %s packages are missing or different: %s" % + (c, '\n'.join(r.test for r in (result.missing + result.different)))) + + if fails: + self.fail('\n'.join(fails)) # Clean up empty directories if self.save_results: -- cgit v1.2.3-54-g00ecf