diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-22 10:44:24 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-22 15:55:59 +0000 |
| commit | 9bfa04aa1f1a0b38ffa51f0211f3a46a90e17b0a (patch) | |
| tree | d20c19316800d3b9c5fc890d92526606ffe6978d | |
| parent | 7c653337360dd5e49809b930f22a999c1d6e09ee (diff) | |
| download | openembedded-core-9bfa04aa1f1a0b38ffa51f0211f3a46a90e17b0a.tar.gz | |
oeqa/reproducible: Fix unset save_dir variable
Previous refactoring broke the case where save_dir was set. Fix this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 10 |
1 files 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) |