From dcf7eeec1e68cfe32613da9d460da73d222e7b06 Mon Sep 17 00:00:00 2001 From: Sundeep KOKKONDA Date: Thu, 18 Jul 2024 10:53:51 -0700 Subject: [PATCH] oeqa/selftest/reproducibile: rename of reproducible directories We do see a few reproducible issues are depending on the path length of the build directory. https://bugzilla.yoctoproject.org/show_bug.cgi?id=15554 The current implementation of reproducible tests having different names for directories but with same length. The build directory names are changed to have different length. (From OE-Core rev: 2466ed34a8e5afd8b6f83173316821b78edf954b) Signed-off-by: Sundeep KOKKONDA Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index 7c6cf3eb1f..5460f158e5 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -276,9 +276,13 @@ class ReproducibleTests(OESelftestTestCase): os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) self.logger.info('Non-reproducible packages will be copied to %s', save_dir) + # The below bug shows that a few reproducible issues are depends on build dir path length. + # https://bugzilla.yoctoproject.org/show_bug.cgi?id=15554 + # So, the reproducibleA & reproducibleB directories are changed to reproducibleA & reproducibleB-extended to have different size. + vars_A = self.do_test_build('reproducibleA', self.build_from_sstate) - vars_B = self.do_test_build('reproducibleB', False) + vars_B = self.do_test_build('reproducibleB-extended', False) # NOTE: The temp directories from the reproducible build are purposely # kept after the build so it can be diffed for debugging. @@ -333,7 +337,7 @@ class ReproducibleTests(OESelftestTestCase): # Copy jquery to improve the diffoscope output usability self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) - run_diffoscope('reproducibleA', 'reproducibleB', package_html_dir, max_report_size=self.max_report_size, + run_diffoscope('reproducibleA', 'reproducibleB-extended', package_html_dir, max_report_size=self.max_report_size, native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) if fails: