diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2017-02-21 14:33:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:08 +0000 |
commit | 9365e5f7a986fc1991f53a675e2186f8459d8a79 (patch) | |
tree | 57ddf6821d0963fc6e1da3b047cafefc6cd1f66b /meta/lib/oeqa/selftest/signing.py | |
parent | 093f673b2a0afe968101c431914b91940b8abf70 (diff) | |
download | poky-9365e5f7a986fc1991f53a675e2186f8459d8a79.tar.gz |
selftest: Avoid sstate corruption by calling cleansstate
Currently selftest doesn't use sstates because some tests
clean sstate cache; using sstates would give a performance
boost instead of building everything from scratch.
With this sstates are not corrupted using different methods
depending on tests:
devtool: These tests needed to delete the cache so SSTATE_DIR
as SSTATE_MIRRORS and set a temporal SSTATE_DIR.
sstatetests: This module already used a temporal SSTATE_DIR, so
just set up the SSTATE_MIRRORS.
Rest: Removed cleansstate, some of them required to force a
certain task, others were just removed or changed for another
task.
[YOCTO #10929]
(From OE-Core rev: 62c61087a10cc3b26fbff32c9e2efd1704a39724)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/signing.py')
-rw-r--r-- | meta/lib/oeqa/selftest/signing.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py index 70e8369876..35c2dc12ab 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py | |||
@@ -54,8 +54,9 @@ class Signing(oeSelfTest): | |||
54 | 54 | ||
55 | self.write_config(feature) | 55 | self.write_config(feature) |
56 | 56 | ||
57 | bitbake('-c cleansstate %s' % test_recipe) | 57 | bitbake('-c clean %s' % test_recipe) |
58 | bitbake(test_recipe) | 58 | bitbake('-f -c package_write_rpm %s' % test_recipe) |
59 | |||
59 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) | 60 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) |
60 | 61 | ||
61 | pkgdatadir = get_bb_var('PKGDATA_DIR', test_recipe) | 62 | pkgdatadir = get_bb_var('PKGDATA_DIR', test_recipe) |
@@ -98,7 +99,6 @@ class Signing(oeSelfTest): | |||
98 | sstatedir = os.path.join(builddir, 'test-sstate') | 99 | sstatedir = os.path.join(builddir, 'test-sstate') |
99 | 100 | ||
100 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) | 101 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) |
101 | self.add_command_to_tearDown('bitbake -c cleansstate %s' % test_recipe) | ||
102 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) | 102 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) |
103 | 103 | ||
104 | # Determine the pub key signature | 104 | # Determine the pub key signature |
@@ -115,7 +115,7 @@ class Signing(oeSelfTest): | |||
115 | 115 | ||
116 | self.write_config(feature) | 116 | self.write_config(feature) |
117 | 117 | ||
118 | bitbake('-c cleansstate %s' % test_recipe) | 118 | bitbake('-c clean %s' % test_recipe) |
119 | bitbake(test_recipe) | 119 | bitbake(test_recipe) |
120 | 120 | ||
121 | recipe_sig = glob.glob(sstatedir + '/*/*:ed:*_package.tgz.sig') | 121 | recipe_sig = glob.glob(sstatedir + '/*/*:ed:*_package.tgz.sig') |