From 480b881c0ad08618fbc5e9d9d0de4bf6da5dc26d Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 13 Nov 2017 15:22:24 +0800 Subject: oeqa: make OEHasPackage() check multilib package Make OEHasPackage() check multilib package when test multilib image, for example, OEHasPackage(['dnf']) should check lib32-dnf when test lib32-core-image-sato, this can make "bitbake lib32-core-image-sato -ctestimage" work, otherwise the testcases would be skipped. Signed-off-by: Robert Yang --- meta/lib/oeqa/runtime/decorator/package.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'meta/lib/oeqa/runtime') diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py index aa6ecb68fa..1a8bc0099e 100644 --- a/meta/lib/oeqa/runtime/decorator/package.py +++ b/meta/lib/oeqa/runtime/decorator/package.py @@ -32,11 +32,20 @@ class OEHasPackage(OETestDecorator): need_pkgs = set() unneed_pkgs = set() pkgs = strToSet(self.need_pkgs) + # Conver to multilib + mlprefix = self.case.tc.td['MLPREFIX'] for pkg in pkgs: if pkg.startswith('!'): - unneed_pkgs.add(pkg[1:]) + pkg_name = pkg[1:] + if mlprefix and not pkg_name.startswith(mlprefix): + unneed_pkgs.add('%s%s' % (mlprefix, pkg_name)) + else: + unneed_pkgs.add(pkg_name) else: - need_pkgs.add(pkg) + if mlprefix and not pkg.startswith(mlprefix): + need_pkgs.add('%s%s' % (mlprefix, pkg)) + else: + need_pkgs.add(pkg) if unneed_pkgs: msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) -- cgit 1.2.3-korg