mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

selftest: reproducible: Set maximum report size

Browse Source 
Diffoscope can end up running for a very long time if there are a lot of
changes. To put a limit on how long it can run, cap the maximum report
size at 250 MB by default.

(From OE-Core rev: 52d5f76f54eac384f9480dffe96df089d9ee8f33)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2022-01-06 10:42:36 -06:00
committed by Richard Purdie
parent d5279dac96
commit bc22fe89fd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/reproducible.py
+7 -3
View File
@@ -105,8 +105,9 @@ def compare_file(reference, test, diffutils_sysroot):
result.status = SAME result.status = SAME
return result return result
def run_diffoscope(a_dir, b_dir, html_dir, **kwargs): def run_diffoscope(a_dir, b_dir, html_dir, max_report_size=0, **kwargs):
return runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', 'yes', '--html-dir', html_dir, a_dir, b_dir], return runCmd(['diffoscope', '--no-default-limits', '--max-report-size', str(max_report_size),
'--exclude-directory-metadata', 'yes', '--html-dir', html_dir, a_dir, b_dir],
**kwargs) **kwargs)
class DiffoscopeTests(OESelftestTestCase): class DiffoscopeTests(OESelftestTestCase):
@@ -136,6 +137,9 @@ class ReproducibleTests(OESelftestTestCase):
package_classes = ['deb', 'ipk', 'rpm'] package_classes = ['deb', 'ipk', 'rpm']
# Maximum report size, in bytes
max_report_size = 250 * 1024 * 1024
# targets are the things we want to test the reproducibility of # targets are the things we want to test the reproducibility of
targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world']
# sstate targets are things to pull from sstate to potentially cut build/debugging time # sstate targets are things to pull from sstate to potentially cut build/debugging time
@@ -311,7 +315,7 @@ class ReproducibleTests(OESelftestTestCase):
# Copy jquery to improve the diffoscope output usability # 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')) 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, run_diffoscope('reproducibleA', 'reproducibleB', package_html_dir, max_report_size=self.max_report_size,
native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir)
if fails: if fails: