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.
Signed-off-by: Richard Purdie <[email protected]> --- meta/lib/oeqa/sdk/context.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 77e6a98f391..d968cfa2be9 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -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):
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#210508): https://lists.openembedded.org/g/openembedded-core/message/210508 Mute This Topic: https://lists.openembedded.org/mt/110933231/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
