oeqa/reproducible: Fix unset save_dir variable

Previous refactoring broke the case where save_dir was set. Fix this.

(From OE-Core rev: 9bfa04aa1f1a0b38ffa51f0211f3a46a90e17b0a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-01-22 10:44:24 +00:00
parent 1d65844ab0
commit 9f225cf966

View File

@ -137,11 +137,6 @@ class ReproducibleTests(OESelftestTestCase):
def do_test_build(self, name, use_sstate):
capture_vars = ['DEPLOY_DIR_' + c.upper() for c in self.package_classes]
if self.save_results:
save_dir = tempfile.mkdtemp(prefix='oe-reproducible-')
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)
tmpdir = os.path.join(self.topdir, name, 'tmp')
if os.path.exists(tmpdir):
bb.utils.remove(tmpdir, recurse=True)
@ -172,6 +167,11 @@ class ReproducibleTests(OESelftestTestCase):
bitbake("diffutils-native -c addto_recipe_sysroot")
diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native")
if self.save_results:
save_dir = tempfile.mkdtemp(prefix='oe-reproducible-')
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)
vars_A = self.do_test_build('reproducibleA', self.build_from_sstate)
vars_B = self.do_test_build('reproducibleB', False)