mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-12 03:33:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

selftest: moved tc test_buildhistory_does_not_change_signatures

Browse Source 
Moved test_buildhistory_does_not_change_signatures from
buildhistory/BuildhistoryBase to buildoptions/BuildhistoryTests.

The test being in the base class was causing it to run
multiple times.

Fix for [YOCTO #8867]

(From OE-Core rev: 975e67e28ccba5dcb0fced43c1f9e7da183dc201)

Signed-off-by: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Daniel Istrate
2016-01-04 15:26:08 +02:00
committed by Richard Purdie
parent 02d259c1f4
commit 4ec2da71db
2 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
meta/lib/oeqa/selftest/buildhistory.py
View File

@@ -42,65 +42,5 @@ class BuildhistoryBase(oeSelfTest):
else:
self.assertEqual(result.status, 0, msg="Command 'bitbake %s' has failed unexpectedly: %s" % (target, result.output))
@testcase(1386)
def test_buildhistory_does_not_change_signatures(self):
"""
Summary: Ensure that buildhistory does not change signatures
Expected: Only 'do_rootfs' and 'do_build' tasks are rerun
Product: oe-core
Author: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
tmpdir1_name = 'tmpsig1'
tmpdir2_name = 'tmpsig2'
builddir = os.environ.get('BUILDDIR')
tmpdir1 = os.path.join(builddir, tmpdir1_name)
tmpdir2 = os.path.join(builddir, tmpdir2_name)
self.track_for_cleanup(tmpdir1)
self.track_for_cleanup(tmpdir2)
features = 'TMPDIR = "%s"\n' % tmpdir1
self.write_config(features)
bitbake('core-image-sato -S none')
features = 'TMPDIR = "%s"\n' % tmpdir2
features += 'INHERIT += "buildhistory"\n'
self.write_config(features)
bitbake('core-image-sato -S none')
def get_files(d):
f = []
for root, dirs, files in os.walk(d):
for name in files:
f.append(os.path.join(root, name))
return f
files1 = get_files(tmpdir1 + '/stamps')
files2 = get_files(tmpdir2 + '/stamps')
files2 = [x.replace(tmpdir2_name, tmpdir1_name) for x in files2]
f1 = set(files1)
f2 = set(files2)
sigdiff = f1 - f2
self.assertEqual(len(sigdiff), 2, 'Expected 2 signature differences. Out: %s' % list(sigdiff))
unexpected_diff = []
# No new signatures should appear apart from do_rootfs and do_build
found_do_rootfs_flag = False
found_do_build_flag = False
for sig in sigdiff:
if 'do_rootfs' in sig:
found_do_rootfs_flag = True
elif 'do_build' in sig:
found_do_build_flag = True
else:
unexpected_diff.append(sig)
self.assertTrue(found_do_rootfs_flag, 'Task do_rootfs did not rerun.')
self.assertTrue(found_do_build_flag, 'Task do_build did not rerun')
self.assertFalse(unexpected_diff, 'Found unexpected signature differences. Out: %s' % unexpected_diff)
# No tests should be added to the base class.
# Please create a new class that inherit this one, or use one of those already available for adding tests.

64
meta/lib/oeqa/selftest/buildoptions.py
View File

@@ -118,6 +118,70 @@ class BuildhistoryTests(BuildhistoryBase):
self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True)
self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True, error_regex=error)
@testcase(1386)
def test_buildhistory_does_not_change_signatures(self):
"""
Summary: Ensure that buildhistory does not change signatures
Expected: Only 'do_rootfs' and 'do_build' tasks are rerun
Product: oe-core
Author: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
"""
tmpdir1_name = 'tmpsig1'
tmpdir2_name = 'tmpsig2'
builddir = os.environ.get('BUILDDIR')
tmpdir1 = os.path.join(builddir, tmpdir1_name)
tmpdir2 = os.path.join(builddir, tmpdir2_name)
self.track_for_cleanup(tmpdir1)
self.track_for_cleanup(tmpdir2)
features = 'TMPDIR = "%s"\n' % tmpdir1
self.write_config(features)
bitbake('core-image-sato -S none')
features = 'TMPDIR = "%s"\n' % tmpdir2
features += 'INHERIT += "buildhistory"\n'
self.write_config(features)
bitbake('core-image-sato -S none')
def get_files(d):
f = []
for root, dirs, files in os.walk(d):
for name in files:
f.append(os.path.join(root, name))
return f
files1 = get_files(tmpdir1 + '/stamps')
files2 = get_files(tmpdir2 + '/stamps')
files2 = [x.replace(tmpdir2_name, tmpdir1_name) for x in files2]
f1 = set(files1)
f2 = set(files2)
sigdiff = f1 - f2
self.assertEqual(len(sigdiff), 2, 'Expected 2 signature differences. Out: %s' % list(sigdiff))
unexpected_diff = []
# No new signatures should appear apart from do_rootfs and do_build
found_do_rootfs_flag = False
found_do_build_flag = False
for sig in sigdiff:
if 'do_rootfs' in sig:
found_do_rootfs_flag = True
elif 'do_build' in sig:
found_do_build_flag = True
else:
unexpected_diff.append(sig)
self.assertTrue(found_do_rootfs_flag, 'Task do_rootfs did not rerun.')
self.assertTrue(found_do_build_flag, 'Task do_build did not rerun')
self.assertFalse(unexpected_diff, 'Found unexpected signature differences. Out: %s' % unexpected_diff)
class BuildImagesTest(oeSelfTest):
@testcase(563)
def test_directfb(self):