diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-26 15:36:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:35:57 +0100 |
commit | b5fcf4ec1b6b0049a12655b489ded39841c7f4b4 (patch) | |
tree | 9647ad90a190ef482aa5f85e6bfa97a633bec78b /meta | |
parent | 386c7c6ff59cc93bb6629e4dd1c41f4068b53c65 (diff) | |
download | poky-b5fcf4ec1b6b0049a12655b489ded39841c7f4b4.tar.gz |
oeqa/selftest/buildoptions: remove buildhistory signature test
This test is a subset of the new sstate_noop_samesigs test, and less helpful
when it breaks, so remove it.
(From OE-Core rev: 7157261014e1dcbe9a57e7504dbb0ab2a53aa4d8)
(From OE-Core rev: da040dab3b1e15821b1a57a3c4c8c352b15e7fea)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index 35d5dfd29a..b6151d7d82 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py | |||
@@ -199,65 +199,6 @@ class BuildhistoryTests(BuildhistoryBase): | |||
199 | self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) | 199 | self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True) |
200 | self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error) | 200 | self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error) |
201 | 201 | ||
202 | @testcase(1386) | ||
203 | def test_buildhistory_does_not_change_signatures(self): | ||
204 | """ | ||
205 | Summary: Ensure that buildhistory does not change signatures | ||
206 | Expected: Only 'do_rootfs' task should be rerun | ||
207 | Product: oe-core | ||
208 | Author: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | ||
209 | AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> | ||
210 | """ | ||
211 | |||
212 | tmpdir1_name = 'tmpsig1' | ||
213 | tmpdir2_name = 'tmpsig2' | ||
214 | builddir = os.environ.get('BUILDDIR') | ||
215 | tmpdir1 = os.path.join(builddir, tmpdir1_name) | ||
216 | tmpdir2 = os.path.join(builddir, tmpdir2_name) | ||
217 | |||
218 | self.track_for_cleanup(tmpdir1) | ||
219 | self.track_for_cleanup(tmpdir2) | ||
220 | |||
221 | features = 'TMPDIR = "%s"\n' % tmpdir1 | ||
222 | self.write_config(features) | ||
223 | bitbake('core-image-minimal -S none -c rootfs') | ||
224 | |||
225 | features = 'TMPDIR = "%s"\n' % tmpdir2 | ||
226 | features += 'INHERIT += "buildhistory"\n' | ||
227 | self.write_config(features) | ||
228 | bitbake('core-image-minimal -S none -c rootfs') | ||
229 | |||
230 | def get_files(d): | ||
231 | f = [] | ||
232 | for root, dirs, files in os.walk(d): | ||
233 | for name in files: | ||
234 | f.append(os.path.join(root, name)) | ||
235 | return f | ||
236 | |||
237 | files1 = get_files(tmpdir1 + '/stamps') | ||
238 | files2 = get_files(tmpdir2 + '/stamps') | ||
239 | files2 = [x.replace(tmpdir2_name, tmpdir1_name) for x in files2] | ||
240 | |||
241 | f1 = set(files1) | ||
242 | f2 = set(files2) | ||
243 | sigdiff = f1 - f2 | ||
244 | |||
245 | self.assertEqual(len(sigdiff), 1, 'Expected 1 signature differences. Out: %s' % list(sigdiff)) | ||
246 | |||
247 | unexpected_diff = [] | ||
248 | |||
249 | # No new signatures should appear apart from do_rootfs | ||
250 | found_do_rootfs_flag = False | ||
251 | |||
252 | for sig in sigdiff: | ||
253 | if 'do_rootfs' in sig: | ||
254 | found_do_rootfs_flag = True | ||
255 | else: | ||
256 | unexpected_diff.append(sig) | ||
257 | |||
258 | self.assertTrue(found_do_rootfs_flag, 'Task do_rootfs did not rerun.') | ||
259 | self.assertFalse(unexpected_diff, 'Found unexpected signature differences. Out: %s' % unexpected_diff) | ||
260 | |||
261 | 202 | ||
262 | class BuildImagesTest(oeSelfTest): | 203 | class BuildImagesTest(oeSelfTest): |
263 | @testcase(563) | 204 | @testcase(563) |