oeqa/selftests/reproducible: use the jQuery CDN instead of jquery-native

Instead of building jquery-native and then copying the file into the
expected place in the build tree, simply tell diffoscope to load jQuery
from their CDN.

In the slim chance that the diffoscope report is viewed offline, the
only regression is that sections cannot be collapsed.

The advantage to this approach is that we no longer need to maintain a
jquery-native recipe simply for the reproducible selftests.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index bad17cc40b2b39d67c928ace5da5b40ade2e0c58..7adeaacd4f53199220f79be262db7b83671363d9 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -105,6 +105,7 @@ def run_diffoscope(a_dir, b_dir, html_dir, max_report_size=0, max_diff_block_lin
            '--max-diff-block-lines', str(max_diff_block_lines),
            '--exclude-directory-metadata', 'yes',
            '--html-dir', html_dir,
+           '--jquery', 'https://code.jquery.com/jquery-3.7.1.min.js',
            a_dir, b_dir]
     return runCmd(cmd, **kwargs)
 
@@ -319,10 +320,9 @@ class ReproducibleTests(OESelftestTestCase):
 
         # Build native utilities
         self.write_config('')
-        bitbake("diffoscope-native diffutils-native jquery-native -c addto_recipe_sysroot")
+        bitbake("diffoscope-native diffutils-native -c addto_recipe_sysroot")
         diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native")
         diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native")
-        jquery_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "jquery-native")
 
         if self.save_results:
             os.makedirs(self.save_results, exist_ok=True)
@@ -398,9 +398,6 @@ class ReproducibleTests(OESelftestTestCase):
                 package_dir = os.path.join(save_dir, 'packages')
                 package_html_dir = os.path.join(package_dir, 'diff-html')
 
-                # 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-extended', package_html_dir, max_report_size=self.max_report_size,
                         max_diff_block_lines_saved=self.max_diff_block_lines_saved,
                         max_diff_block_lines=self.max_diff_block_lines,