selftest/archiver: add tests for recipe type filtering
The archiver used to be able to filter based on COPYLEFT_RECIPE_TYPES.
Unfortunately, this got broken with the fix for
https://bugzilla.yoctoproject.org/show_bug.cgi?id=6929
in commit ae9102bda3
("copyleft_filter.bbclass: Allow to filter on name")
Add two tests to prevent that from happening again.
(From OE-Core rev: 11064f15d7fc10b99eac4084af48a91d8b212932)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 709f02c5cb25983090251c6237bac4fc0a295c4f)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
28b8850356
commit
edae320ef5
|
@ -41,3 +41,79 @@ class Archiver(oeSelfTest):
|
||||||
# Check that exclude_recipe was excluded
|
# Check that exclude_recipe was excluded
|
||||||
excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe))
|
excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe))
|
||||||
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe)
|
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe)
|
||||||
|
|
||||||
|
|
||||||
|
def test_archiver_filters_by_type(self):
|
||||||
|
"""
|
||||||
|
Summary: The archiver is documented to filter on the recipe type.
|
||||||
|
Expected: 1. included recipe type (target) should be included
|
||||||
|
2. other types should be excluded
|
||||||
|
Product: oe-core
|
||||||
|
Author: André Draszik <adraszik@tycoint.com>
|
||||||
|
"""
|
||||||
|
|
||||||
|
target_recipe = 'initscripts'
|
||||||
|
native_recipe = 'zlib-native'
|
||||||
|
|
||||||
|
features = 'INHERIT += "archiver"\n'
|
||||||
|
features += 'ARCHIVER_MODE[src] = "original"\n'
|
||||||
|
features += 'COPYLEFT_RECIPE_TYPES = "target"\n'
|
||||||
|
self.write_config(features)
|
||||||
|
|
||||||
|
bitbake('-c clean %s %s' % (target_recipe, native_recipe))
|
||||||
|
bitbake("%s -c deploy_archives %s" % (target_recipe, native_recipe))
|
||||||
|
|
||||||
|
bb_vars = get_bb_vars(['DEPLOY_DIR_SRC', 'TARGET_SYS', 'BUILD_SYS'])
|
||||||
|
src_path_target = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['TARGET_SYS'])
|
||||||
|
src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS'])
|
||||||
|
|
||||||
|
# Check that target_recipe was included
|
||||||
|
included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipe))
|
||||||
|
self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipe)
|
||||||
|
|
||||||
|
# Check that native_recipe was excluded
|
||||||
|
excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipe))
|
||||||
|
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipe)
|
||||||
|
|
||||||
|
def test_archiver_filters_by_type_and_name(self):
|
||||||
|
"""
|
||||||
|
Summary: Test that the archiver archives by recipe type, taking the
|
||||||
|
recipe name into account.
|
||||||
|
Expected: 1. included recipe type (target) should be included
|
||||||
|
2. other types should be excluded
|
||||||
|
3. recipe by name should be included / excluded,
|
||||||
|
overriding previous decision by type
|
||||||
|
Product: oe-core
|
||||||
|
Author: André Draszik <adraszik@tycoint.com>
|
||||||
|
"""
|
||||||
|
|
||||||
|
target_recipes = [ 'initscripts', 'zlib' ]
|
||||||
|
native_recipes = [ 'update-rc.d-native', 'zlib-native' ]
|
||||||
|
|
||||||
|
features = 'INHERIT += "archiver"\n'
|
||||||
|
features += 'ARCHIVER_MODE[src] = "original"\n'
|
||||||
|
features += 'COPYLEFT_RECIPE_TYPES = "target"\n'
|
||||||
|
features += 'COPYLEFT_PN_INCLUDE = "%s"\n' % native_recipes[1]
|
||||||
|
features += 'COPYLEFT_PN_EXCLUDE = "%s"\n' % target_recipes[1]
|
||||||
|
self.write_config(features)
|
||||||
|
|
||||||
|
bitbake('-c clean %s %s' % (' '.join(target_recipes), ' '.join(native_recipes)))
|
||||||
|
bitbake('-c deploy_archives %s %s' % (' '.join(target_recipes), ' '.join(native_recipes)))
|
||||||
|
|
||||||
|
bb_vars = get_bb_vars(['DEPLOY_DIR_SRC', 'TARGET_SYS', 'BUILD_SYS'])
|
||||||
|
src_path_target = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['TARGET_SYS'])
|
||||||
|
src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS'])
|
||||||
|
|
||||||
|
# Check that target_recipe[0] and native_recipes[1] were included
|
||||||
|
included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[0]))
|
||||||
|
self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipes[0])
|
||||||
|
|
||||||
|
included_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[1]))
|
||||||
|
self.assertTrue(included_present, 'Recipe %s was not included.' % native_recipes[1])
|
||||||
|
|
||||||
|
# Check that native_recipes[0] and target_recipes[1] were excluded
|
||||||
|
excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[0]))
|
||||||
|
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipes[0])
|
||||||
|
|
||||||
|
excluded_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[1]))
|
||||||
|
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % target_recipes[1])
|
||||||
|
|
Loading…
Reference in New Issue