From 16ca89f0bb9aa1ad520fd364afb42f0310cd9b7a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sat, 10 May 2025 09:43:37 +0100 Subject: oeqa/sdk/context: fix multilib handling bug in hasTargetPackage hasTargetPackage has some logic to automatically multilibify package names if needed (for example, so that gtk+3 becomes lib32-gtk+3). Due to a logic bug if multilib was True but there were no multilibs configured then this prepended "-" to the package name, which won't exist. This resulted in tests being skipped as the dependent packages are not installed. Solve this by only prepending to the package name if requested and if a multilib environment has been detected. (From OE-Core rev: 2abb146dd81f677176923ebb3188f5b7c034ed68) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index d968cfa2be..d4fdd83207 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -47,7 +47,7 @@ class OESDKTestContext(OETestContext): return self._hasPackage(self.host_pkg_manifest, pkg, regex=regex) def hasTargetPackage(self, pkg, multilib=False, regex=False): - if multilib: + if multilib and self.multilib: pkg = self.multilib + '-' + pkg return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex) -- cgit v1.2.3-54-g00ecf