diff options
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcvs.py | 8 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildgalculator.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildiptables.py | 8 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/gcc.py | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py index 1ffd8cbc75c..4b6a79da712 100644 --- a/meta/lib/oeqa/sdk/cases/buildcvs.py +++ b/meta/lib/oeqa/sdk/cases/buildcvs.py @@ -15,10 +15,10 @@ class BuildCvsTest(OESDKTestCase): self.project.download_archive() machine = self.td.get("MACHINE") - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or - self.tc.hasHostPackage("gcc-runtime") or - self.tc.hasHostPackage("libgcc") or - self.tc.hasHostPackage("gcc-sanitizers")): + if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or + self.tc.hasTargetPackage("gcc-runtime") or + self.tc.hasTargetPackage("libgcc") or + self.tc.hasTargetPackage("gcc-sanitizers")): raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") def test_cvs(self): diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py index 42e8ddb185c..76874ad00e9 100644 --- a/meta/lib/oeqa/sdk/cases/buildgalculator.py +++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py @@ -9,7 +9,9 @@ class GalculatorTest(OESDKTestCase): @classmethod def setUpClass(self): if not (self.tc.hasTargetPackage("gtk+3") or\ - self.tc.hasTargetPackage("libgtk-3.0")): + self.tc.hasTargetPackage("libgtk-3.0") or + self.tc.hasTargetPackage("gtk+") or + self.tc.hasTargetPackage("matchbox-config-gtk")): raise unittest.SkipTest("GalculatorTest class: SDK don't support gtk+3") def test_galculator(self): diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py index 621fb55fc5b..d7a0e6a5e92 100644 --- a/meta/lib/oeqa/sdk/cases/buildiptables.py +++ b/meta/lib/oeqa/sdk/cases/buildiptables.py @@ -17,10 +17,10 @@ class BuildIptablesTest(OESDKTestCase): machine = self.td.get("MACHINE") - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or - self.tc.hasHostPackage("gcc-runtime") or - self.tc.hasHostPackage("libgcc") or - self.tc.hasHostPackage("gcc-sanitizers")): + if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or + self.tc.hasTargetPackage("gcc-runtime") or + self.tc.hasTargetPackage("libgcc") or + self.tc.hasTargetPackage("gcc-sanitizers")): raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") def test_iptables(self): diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index d8692472bed..a183cfc74c8 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py @@ -18,8 +18,10 @@ class GccCompileTest(OESDKTestCase): def setUp(self): machine = self.td.get("MACHINE") - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or - self.tc.hasHostPackage("gcc-runtime")): + if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or + self.tc.hasTargetPackage("gcc-runtime") or + self.tc.hasTargetPackage("libgcc") or + self.tc.hasTargetPackage("gcc-sanitizers")): raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain") def test_gcc_compile(self): |