summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSundeep KOKKONDA <sundeep.kokkonda@windriver.com>2024-07-18 10:53:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-19 17:51:00 +0100
commitdcf7eeec1e68cfe32613da9d460da73d222e7b06 (patch)
treeca7ccdef7b1dcc7f5b156bf6a0c65a4b292879d3
parent76212866402edb947f745f837e3c3b98b3056e58 (diff)
downloadpoky-dcf7eeec1e68cfe32613da9d460da73d222e7b06.tar.gz
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 <sundeep.kokkonda@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py8
1 files 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):
276 os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) 276 os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
277 self.logger.info('Non-reproducible packages will be copied to %s', save_dir) 277 self.logger.info('Non-reproducible packages will be copied to %s', save_dir)
278 278
279 # The below bug shows that a few reproducible issues are depends on build dir path length.
280 # https://bugzilla.yoctoproject.org/show_bug.cgi?id=15554
281 # So, the reproducibleA & reproducibleB directories are changed to reproducibleA & reproducibleB-extended to have different size.
282
279 vars_A = self.do_test_build('reproducibleA', self.build_from_sstate) 283 vars_A = self.do_test_build('reproducibleA', self.build_from_sstate)
280 284
281 vars_B = self.do_test_build('reproducibleB', False) 285 vars_B = self.do_test_build('reproducibleB-extended', False)
282 286
283 # NOTE: The temp directories from the reproducible build are purposely 287 # NOTE: The temp directories from the reproducible build are purposely
284 # kept after the build so it can be diffed for debugging. 288 # kept after the build so it can be diffed for debugging.
@@ -333,7 +337,7 @@ class ReproducibleTests(OESelftestTestCase):
333 # Copy jquery to improve the diffoscope output usability 337 # Copy jquery to improve the diffoscope output usability
334 self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) 338 self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js'))
335 339
336 run_diffoscope('reproducibleA', 'reproducibleB', package_html_dir, max_report_size=self.max_report_size, 340 run_diffoscope('reproducibleA', 'reproducibleB-extended', package_html_dir, max_report_size=self.max_report_size,
337 native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) 341 native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir)
338 342
339 if fails: 343 if fails: