From 9bfa04aa1f1a0b38ffa51f0211f3a46a90e17b0a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Jan 2020 10:44:24 +0000 Subject: oeqa/reproducible: Fix unset save_dir variable Previous refactoring broke the case where save_dir was set. Fix this. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/reproducible.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index c00b92d2e9..9c715ef8eb 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -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) -- cgit 1.2.3-korg