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 <liezhi.yang@windriver.com>

diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py
index aa6ecb68fa4ae1b9ba25306e19139d3fabe607eb..1a8bc0099e27b5ee2bbb23a56b5dcec9b2a35d44 100644 (file)
--- 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)