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:56:14 +0000 |
| commit | 9f225cf966b8a96775d74f41423206d157bce2e3 (patch) | |
| tree | ec98591e9ef524fa09524df9e8cb502ec5d78ff9 | |
| parent | 1d65844ab0d03cdbffbbe0c3cef6be037d437c2d (diff) | |
| download | poky-9f225cf966b8a96775d74f41423206d157bce2e3.tar.gz | |
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>
| -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): | |||
| 137 | def do_test_build(self, name, use_sstate): | 137 | def do_test_build(self, name, use_sstate): |
| 138 | capture_vars = ['DEPLOY_DIR_' + c.upper() for c in self.package_classes] | 138 | capture_vars = ['DEPLOY_DIR_' + c.upper() for c in self.package_classes] |
| 139 | 139 | ||
| 140 | if self.save_results: | ||
| 141 | save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') | ||
| 142 | os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) | ||
| 143 | self.logger.info('Non-reproducible packages will be copied to %s', save_dir) | ||
| 144 | |||
| 145 | tmpdir = os.path.join(self.topdir, name, 'tmp') | 140 | tmpdir = os.path.join(self.topdir, name, 'tmp') |
| 146 | if os.path.exists(tmpdir): | 141 | if os.path.exists(tmpdir): |
| 147 | bb.utils.remove(tmpdir, recurse=True) | 142 | bb.utils.remove(tmpdir, recurse=True) |
| @@ -172,6 +167,11 @@ class ReproducibleTests(OESelftestTestCase): | |||
| 172 | bitbake("diffutils-native -c addto_recipe_sysroot") | 167 | bitbake("diffutils-native -c addto_recipe_sysroot") |
| 173 | diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") | 168 | diffutils_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffutils-native") |
| 174 | 169 | ||
| 170 | if self.save_results: | ||
| 171 | save_dir = tempfile.mkdtemp(prefix='oe-reproducible-') | ||
| 172 | os.chmod(save_dir, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) | ||
| 173 | self.logger.info('Non-reproducible packages will be copied to %s', save_dir) | ||
| 174 | |||
| 175 | vars_A = self.do_test_build('reproducibleA', self.build_from_sstate) | 175 | vars_A = self.do_test_build('reproducibleA', self.build_from_sstate) |
| 176 | vars_B = self.do_test_build('reproducibleB', False) | 176 | vars_B = self.do_test_build('reproducibleB', False) |
| 177 | 177 | ||
