[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH] oeqa/selftest/sstatetests: Update sstate management script tests to python script
From:       "Richard Purdie" <richard.purdie () linuxfoundation ! org>
Date:       2023-12-30 0:36:00
Message-ID: 20231230003600.472835-1-richard.purdie () linuxfoundation ! org
[Download RAW message or body]

Content-Transfer-Encoding: 8bit

Now we've switched to the python script, update the tests to match
that by removing the now unneeded parameter.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oeqa/selftest/cases/sstatetests.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py \
b/meta/lib/oeqa/selftest/cases/sstatetests.py index 9a6bea553ff..340f41162f0 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -263,7 +263,7 @@ class SStateDistroTests(SStateBase):
 
 class SStateCacheManagement(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
-    # 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) +    # global_config elements are expected to not generate any sstate files \
that would be removed by sstate-cache-management.py (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)
@@ -277,14 +277,10 @@ class SStateCacheManagement(SStateBase):
         # For now 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 + \
r'.*?\.tar.zst$')  bitbake("-cclean %s" % target)
@@ -296,7 +292,7 @@ class SStateCacheManagement(SStateBase):
             self.remove_recipeinc(target, target_config[idx])
             self.assertEqual(result.status, 0, msg = "build of %s failed with %s" % \
(target, result.output))  
-        runCmd("sstate-cache-management.py -y --cache-dir=%s --remove-duplicated \
--extra-archs=%s" % (self.sstate_path, ','.join(map(str, sstate_archs_list)))) +      \
runCmd("sstate-cache-management.py -y --cache-dir=%s --remove-duplicated" % \
                (self.sstate_path))
         actual_remaining_sstate = [x for x in self.search_sstate(target + \
r'.*?\.tar.zst$') 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]
-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193064): https://lists.openembedded.org/g/openembedded-core/message/193064
Mute This Topic: https://lists.openembedded.org/mt/103426205/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]