Fixes regarding oeqa/sdk

PATCH New Chen Qi 1 participant 4 messages Aug 29, 2018

lore

Share & tools

lore

Chen Qi

author

2018-08-29 02:51 UTC #0 lore raw

cover Fixes regarding oeqa/sdk

The following changes since commit a8368651ffed1bd6c4715a37dfe9f40c48ca23c4:

bitbake: fetcher: Fixed remote removal not throwing exception. (2018-08-28 10:32:08 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/oeqa-sdk
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/oeqa-sdk

Chen Qi (3):
sdk/context.py: add ability to check for multilib version of target
package
sdk/buldgalculator.py: check against multilib for gtk+3 oeqa/sdk: fixes related to hasPackage semantics

 meta/lib/oeqa/sdk/cases/buildgalculator.py |  4 ++--
 meta/lib/oeqa/sdk/cases/buildlzip.py       |  4 ++--
 meta/lib/oeqa/sdk/cases/gcc.py             |  4 ++--
 meta/lib/oeqa/sdk/context.py               | 29 +++++++++++++++++++++--------
 4 files changed, 27 insertions(+), 14 deletions(-)

Signature · 1 line

1.9.1

Chen Qi

author

2018-08-29 02:51 UTC #1 lore raw

PATCH 1/3 sdk/context.py: add ability to check for multilib version of target package

Add a named argument 'multilib' for the hasTargetPackage function. Its default value is False. When setting to True, it will try to get the correct multilib prefix from the sdk_env, the environment setup script.

We need this because we don't want unexpected run of some sdk test cases. The following steps will generate error.

1. Enable multilib for qemux86-64
require conf/multilib.conf
MULTILIBS ?= "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "core2-32"
2. bitbake core-image-sato -c populate_sdk
3. bitbake core-image-sato -c testsdk

The error message is like below.

No package 'gtk+-3.0' found
RESULTS - buildgalculator.GalculatorTest.test_galculator - Testcase -1: FAILED

As we don't have lib32-gtk+3 installed, the test case should be skipped when testing against the lib32 environment setup script.

Signed-off-by Chen Qi <[email protected]>

---
 meta/lib/oeqa/sdk/context.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

meta/lib/oeqa/sdk/context.py +7 -1

index 7c091c0..ec8972d 100644
@@ -29,7 +29,13 @@ class OESDKTestContext(OETestContext):
     def hasHostPackage(self, pkg):
         return self._hasPackage(self.host_pkg_manifest, pkg)
 
-    def hasTargetPackage(self, pkg):
+    def hasTargetPackage(self, pkg, multilib=False):
+        if multilib:
+            # match multilib according to sdk_env
+            mls = self.td.get('MULTILIB_VARIANTS', '').split()
+            for ml in mls:
+                if ('ml'+ml) in self.sdk_env:
+                    pkg = ml + '-' + pkg
         return self._hasPackage(self.target_pkg_manifest, pkg)
 
 class OESDKTestContextExecutor(OETestContextExecutor):

Signature · 1 line

1.9.1

Chen Qi

author

2018-08-29 02:51 UTC #2 lore raw

PATCH 2/3 sdk/buldgalculator.py: check against multilib for gtk+3

In reply to Chen Qi

When determining whether to skip the test case, the check should be done with consideration of multilib. Otherwise, we will meet the following error when testing against lib32 environment.

No package 'gtk+-3.0' found

Signed-off-by Chen Qi <[email protected]>

---
 meta/lib/oeqa/sdk/cases/buildgalculator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/lib/oeqa/sdk/cases/buildgalculator.py +2 -2

index 4c02ea4..3714825 100644
@@ -8,8 +8,8 @@ class GalculatorTest(OESDKTestCase):
 
     @classmethod
     def setUpClass(self):
-        if not (self.tc.hasTargetPackage(r"gtk\+3") or\
-                self.tc.hasTargetPackage(r"libgtk-3.0")):
+        if not (self.tc.hasTargetPackage(r"gtk\+3", multilib=True) or\
+                self.tc.hasTargetPackage(r"libgtk-3.0", multilib=True)):
             raise unittest.SkipTest("GalculatorTest class: SDK don't support gtk+3")
         if not (self.tc.hasHostPackage("nativesdk-gettext-dev")):
             raise unittest.SkipTest("GalculatorTest class: SDK doesn't contain gettext")

Signature · 1 line

1.9.1

Chen Qi

author

2018-08-29 02:51 UTC #3 lore raw

PATCH 3/3 oeqa/sdk: fixes related to hasPackage semantics

In reply to Chen Qi

The current _hasPackage does a regex match when checking for the existence of packages. This will sometimes result in unexpected result. For example, the condition hasTargetPackage('gcc') is likely to be always true as it matches libgcc1.

For most of the time, we should do exact match instead of regex match. So change _hasPackage function to do that. For the current sdk test cases, the only place that needs regex match is '^gcc-'. This is because there's no easy way to get multilib tune arch (e.g. i686) from testdata.json file.

Besides, packagegroup-cross-canadian-xxx and gcc-xxx should be check in host manifest instead of the target one. So fix to use hasHostPackage.

Also, as we are doing exact match, there's no need to use r'gtk\+3', just 'gtk+3' is enough.

Signed-off-by Chen Qi <[email protected]>

---
 meta/lib/oeqa/sdk/cases/buildgalculator.py |  4 ++--
 meta/lib/oeqa/sdk/cases/buildlzip.py       |  4 ++--
 meta/lib/oeqa/sdk/cases/gcc.py             |  4 ++--
 meta/lib/oeqa/sdk/context.py               | 21 ++++++++++++++-------
 4 files changed, 20 insertions(+), 13 deletions(-)

meta/lib/oeqa/sdk/cases/buildgalculator.py +2 -2

index 3714825..050d1b3 100644
@@ -8,8 +8,8 @@ class GalculatorTest(OESDKTestCase):
 
     @classmethod
     def setUpClass(self):
-        if not (self.tc.hasTargetPackage(r"gtk\+3", multilib=True) or\
-                self.tc.hasTargetPackage(r"libgtk-3.0", multilib=True)):
+        if not (self.tc.hasTargetPackage("gtk+3", multilib=True) or \
+                self.tc.hasTargetPackage("libgtk-3.0", multilib=True)):
             raise unittest.SkipTest("GalculatorTest class: SDK don't support gtk+3")
         if not (self.tc.hasHostPackage("nativesdk-gettext-dev")):
             raise unittest.SkipTest("GalculatorTest class: SDK doesn't contain gettext")

meta/lib/oeqa/sdk/cases/buildlzip.py +2 -2

index 3a89ce8..b28cc3a 100644
@@ -17,8 +17,8 @@ class BuildLzipTest(OESDKTestCase):
 
         machine = self.td.get("MACHINE")
 
-        if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or
-                self.tc.hasTargetPackage("gcc")):
+        if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or
+                self.tc.hasHostPackage("^gcc-", regex=True)):
             raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain")
 
     def test_lzip(self):

meta/lib/oeqa/sdk/cases/gcc.py +2 -2

index d11f4b6..b32b01f 100644
@@ -18,8 +18,8 @@ class GccCompileTest(OESDKTestCase):
 
     def setUp(self):
         machine = self.td.get("MACHINE")
-        if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or
-                self.tc.hasTargetPackage("gcc")):
+        if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or
+                self.tc.hasHostPackage("^gcc-", regex=True)):
             raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain")
 
     def test_gcc_compile(self):

meta/lib/oeqa/sdk/context.py +14 -7

index ec8972d..adc4166 100644
@@ -20,23 +20,30 @@ class OESDKTestContext(OETestContext):
         self.target_pkg_manifest = target_pkg_manifest
         self.host_pkg_manifest = host_pkg_manifest
 
-    def _hasPackage(self, manifest, pkg):
-        for host_pkg in manifest.keys():
-            if re.search(pkg, host_pkg):
+    def _hasPackage(self, manifest, pkg, regex=False):
+        if regex:
+            # do regex match
+            pat = re.compile(pkg)
+            for p in manifest.keys():
+                if pat.search(p):
+                    return True
+        else:
+            # do exact match
+            if pkg in manifest.keys():
                 return True
         return False
 
-    def hasHostPackage(self, pkg):
-        return self._hasPackage(self.host_pkg_manifest, pkg)
+    def hasHostPackage(self, pkg, regex=False):
+        return self._hasPackage(self.host_pkg_manifest, pkg, regex=regex)
 
-    def hasTargetPackage(self, pkg, multilib=False):
+    def hasTargetPackage(self, pkg, multilib=False, regex=False):
         if multilib:
             # match multilib according to sdk_env
             mls = self.td.get('MULTILIB_VARIANTS', '').split()
             for ml in mls:
                 if ('ml'+ml) in self.sdk_env:
                     pkg = ml + '-' + pkg
-        return self._hasPackage(self.target_pkg_manifest, pkg)
+        return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex)
 
 class OESDKTestContextExecutor(OETestContextExecutor):
     _context_class = OESDKTestContext

Signature · 1 line

1.9.1