diff options
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index d3fd8c392b..5d3959be77 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py | |||
@@ -174,9 +174,10 @@ class ReproducibleTests(OESelftestTestCase): | |||
174 | 174 | ||
175 | # Build native utilities | 175 | # Build native utilities |
176 | self.write_config('') | 176 | self.write_config('') |
177 | bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot") | 177 | bitbake("diffoscope-native diffutils-native jquery-native -c addto_recipe_sysroot") |
178 | diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") | 178 | diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") |
179 | diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") | 179 | diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native") |
180 | jquery_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "jquery-native") | ||
180 | 181 | ||
181 | if self.save_results: | 182 | if self.save_results: |
182 | os.makedirs(self.save_results, exist_ok=True) | 183 | os.makedirs(self.save_results, exist_ok=True) |
@@ -225,8 +226,14 @@ class ReproducibleTests(OESelftestTestCase): | |||
225 | os.rmdir(save_dir) | 226 | os.rmdir(save_dir) |
226 | else: | 227 | else: |
227 | self.logger.info('Running diffoscope') | 228 | self.logger.info('Running diffoscope') |
228 | runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', 'diff-html', 'reproducibleA', 'reproducibleB'], | 229 | package_dir = os.path.join(save_dir, 'packages') |
229 | native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=os.path.join(save_dir, 'packages')) | 230 | package_html_dir = os.path.join(package_dir, 'diff-html') |
231 | |||
232 | # Copy jquery to improve the diffoscope output usability | ||
233 | self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js')) | ||
234 | |||
235 | runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', package_html_dir, 'reproducibleA', 'reproducibleB'], | ||
236 | native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir) | ||
230 | 237 | ||
231 | if fails: | 238 | if fails: |
232 | self.fail('\n'.join(fails)) | 239 | self.fail('\n'.join(fails)) |