diff options
| -rw-r--r-- | meta/lib/oeqa/sdk/context.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 01c38c24e6..77e6a98f39 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py | |||
| @@ -41,11 +41,13 @@ class OESDKTestContext(OETestContext): | |||
| 41 | 41 | ||
| 42 | def hasTargetPackage(self, pkg, multilib=False, regex=False): | 42 | def hasTargetPackage(self, pkg, multilib=False, regex=False): |
| 43 | if multilib: | 43 | if multilib: |
| 44 | # match multilib according to sdk_env | 44 | stripped_sdk_env = os.path.basename(self.sdk_env) |
| 45 | mls = self.td.get('MULTILIB_VARIANTS', '').split() | 45 | if stripped_sdk_env.startswith('environment-setup-'): |
| 46 | for ml in mls: | 46 | # match multilib according to sdk_env |
| 47 | if ('ml'+ml) in self.sdk_env: | 47 | mls = self.td.get('MULTILIB_VARIANTS', '').split() |
| 48 | pkg = ml + '-' + pkg | 48 | for ml in mls: |
| 49 | if ('ml'+ml) in stripped_sdk_env: | ||
| 50 | pkg = ml + '-' + pkg | ||
| 49 | return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex) | 51 | return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex) |
| 50 | 52 | ||
| 51 | class OESDKTestContextExecutor(OETestContextExecutor): | 53 | class OESDKTestContextExecutor(OETestContextExecutor): |