[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH] oe-selftest: Fix test_sstate_cache_management_script*
From: corneliux.stoicescu () intel ! com (Corneliu Stoicescu)
Date: 2014-02-28 16:59:28
Message-ID: 1393606768-3317-1-git-send-email-corneliux.stoicescu () intel ! com
[Download RAW message or body]
Fixed tests for sstate-cache-management.sh that ware failing due to:
- recent changes to sstate-cache structure
- recent changes to the script itself
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu at intel.com>
---
meta/lib/oeqa/selftest/sstatetests.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/sstatetests.py \
b/meta/lib/oeqa/selftest/sstatetests.py index acc0c27..27561ca 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -105,7 +105,8 @@ class SStateTests(SStateBase):
# Test the sstate-cache-management script. Each element in the global_config \
list is used with the corresponding element in the target_config list
- def run_test_sstate_cache_management_script(self, target, global_config=[''], \
target_config=['']): + # global_config elements are expected to not generate any \
sstate files that would be removed by sstate-cache-management.sh (such as changing \
the value of MACHINE) + def run_test_sstate_cache_management_script(self, target, \
global_config=[''], target_config=[''], ignore_patterns=[]): \
self.assertTrue(global_config) self.assertTrue(target_config)
self.assertTrue(len(global_config) == len(target_config), msg='Lists \
global_config and target_config should have the same number of elements') @@ -119,23 \
+120,27 @@ class SStateTests(SStateBase):
# For not this only checks if random sstate tasks are handled correctly as a \
group.
# In the future we should add control over what tasks we check for.
+ sstate_archs_list = []
expected_remaining_sstate = []
for idx in range(len(target_config)):
self.append_config(global_config[idx])
self.append_recipeinc(target, target_config[idx])
+ sstate_arch = get_bb_var('SSTATE_PKGARCH', target)
+ if not sstate_arch in sstate_archs_list:
+ sstate_archs_list.append(sstate_arch)
if target_config[idx] == target_config[-1]:
target_sstate_before_build = self.search_sstate(target + \
'.*?\.tgz$') bitbake("-cclean %s" % target)
result = bitbake(target, ignore_status=True)
if target_config[idx] == target_config[-1]:
target_sstate_after_build = self.search_sstate(target + '.*?\.tgz$')
- expected_remaining_sstate += [x for x in target_sstate_after_build \
if x not in target_sstate_before_build] + expected_remaining_sstate += \
[x for x in target_sstate_after_build if x not in target_sstate_before_build if not \
any(pattern in x for pattern in ignore_patterns)] \
self.remove_config(global_config[idx]) self.remove_recipeinc(target, \
target_config[idx]) self.assertEqual(result.status, 0)
- runCmd("sstate-cache-management.sh -y --cache-dir=%s --remove-duplicated" % \
self.sstate_path)
- actual_remaining_sstate = self.search_sstate(target + '.*?\.tgz$')
+ runCmd("sstate-cache-management.sh -y --cache-dir=%s --remove-duplicated \
--extra-archs=%s" % (self.sstate_path, ','.join(map(str, sstate_archs_list)))) + \
actual_remaining_sstate = [x for x in self.search_sstate(target + '.*?\.tgz$') if not \
any(pattern in x for pattern in ignore_patterns)]
actual_not_expected = [x for x in actual_remaining_sstate if x not in \
expected_remaining_sstate]
self.assertFalse(actual_not_expected, msg="Files should have been removed \
but ware not: %s" % ', '.join(map(str, actual_not_expected))) @@ -168,7 +173,7 @@ \
class SStateTests(SStateBase): target_config.append('PR = "1"')
global_config.append('MACHINE = "qemux86"')
target_config.append('PR = "1"')
- self.run_test_sstate_cache_management_script('m4', global_config, \
target_config) + self.run_test_sstate_cache_management_script('m4', \
global_config, target_config, ignore_patterns=['populate_lic'])
def test_sstate_cache_management_script_using_machine(self):
global_config = []
@@ -177,7 +182,7 @@ class SStateTests(SStateBase):
target_config.append('')
global_config.append('MACHINE = "qemux86"')
target_config.append('')
- self.run_test_sstate_cache_management_script('m4', global_config, \
target_config) + self.run_test_sstate_cache_management_script('m4', \
global_config, target_config, ignore_patterns=['populate_lic'])
--
1.8.3.2
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic