helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-08-14 06:10:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/sdk/context: Improve multilib handling

Browse Source 
Rather than hiding the multilib logic in the package tests, move the
multilib setting to the init function of the class so the logic is
clearer.

(From OE-Core rev: 7699867c3ce979ab615eb677a417bb5b82faecb7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2025-02-01 08:05:14 +00:00
parent 4a7b6f254d
commit 36f2627b13
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta/lib/oeqa/sdk/context.py
View File

@ -23,6 +23,13 @@ class OESDKTestContext(OETestContext):
self.target_pkg_manifest = target_pkg_manifest
self.host_pkg_manifest = host_pkg_manifest
# match multilib according to sdk_env
self.multilib = ""
multilibs = self.td.get('MULTILIB_VARIANTS', '').split()
for ml in multilibs:
if ml in os.path.basename(self.sdk_env):
self.multilib = ml
def _hasPackage(self, manifest, pkg, regex=False):
if regex:
# do regex match
@ -41,13 +48,7 @@ class OESDKTestContext(OETestContext):
def hasTargetPackage(self, pkg, multilib=False, regex=False):
if multilib:
stripped_sdk_env = os.path.basename(self.sdk_env)
if stripped_sdk_env.startswith('environment-setup-'):
# match multilib according to sdk_env
mls = self.td.get('MULTILIB_VARIANTS', '').split()
for ml in mls:
if ('ml'+ml) in stripped_sdk_env:
pkg = ml + '-' + pkg
pkg = self.multilib + '-' + pkg
return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex)
class OESDKTestContextExecutor(OETestContextExecutor):