diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-07 17:27:36 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-06-17 05:10:26 -1000 |
| commit | b93817cc62f4b98bc167065e210d544fe91e4648 (patch) | |
| tree | cfc698166314fb5813060db9e1e3da5c67893a9b | |
| parent | 33e9349a4a2b63c063a66833b0be4c747e2ede7b (diff) | |
| download | poky-b93817cc62f4b98bc167065e210d544fe91e4648.tar.gz | |
selftest/reproducible: Allow native/cross reuse in test
We don't compare reproducibility of the native/cross components, only the
target ones. With the long build times of rust-native, the test now takes
crazy lengths of time so this tweak should allow us to reuse native/cross
artefacts from sstate whilst still testing the target output is
reproducible.
(From OE-Core rev: fd3d9b32256bceacd514bfd5ebfa0a30bcfdbd0c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b494d83c639a877cefeb7cbab6d37195e492f059)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index adaabee47b..be4cdcc429 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py | |||
| @@ -188,7 +188,7 @@ class ReproducibleTests(OESelftestTestCase): | |||
| 188 | 188 | ||
| 189 | def setUpLocal(self): | 189 | def setUpLocal(self): |
| 190 | super().setUpLocal() | 190 | super().setUpLocal() |
| 191 | needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS'] | 191 | needed_vars = ['TOPDIR', 'TARGET_PREFIX', 'BB_NUMBER_THREADS', 'BB_HASHSERVE'] |
| 192 | bb_vars = get_bb_vars(needed_vars) | 192 | bb_vars = get_bb_vars(needed_vars) |
| 193 | for v in needed_vars: | 193 | for v in needed_vars: |
| 194 | setattr(self, v.lower(), bb_vars[v]) | 194 | setattr(self, v.lower(), bb_vars[v]) |
| @@ -259,7 +259,7 @@ class ReproducibleTests(OESelftestTestCase): | |||
| 259 | # mirror, forcing a complete build from scratch | 259 | # mirror, forcing a complete build from scratch |
| 260 | config += textwrap.dedent('''\ | 260 | config += textwrap.dedent('''\ |
| 261 | SSTATE_DIR = "${TMPDIR}/sstate" | 261 | SSTATE_DIR = "${TMPDIR}/sstate" |
| 262 | SSTATE_MIRRORS = "" | 262 | SSTATE_MIRRORS = "file://.*/.*-native.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH file://.*/.*-cross.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" |
| 263 | ''') | 263 | ''') |
| 264 | 264 | ||
| 265 | self.logger.info("Building %s (sstate%s allowed)..." % (name, '' if use_sstate else ' NOT')) | 265 | self.logger.info("Building %s (sstate%s allowed)..." % (name, '' if use_sstate else ' NOT')) |
