diff options
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcvs.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildiptables.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/gcc.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/perl.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/python.py | 5 |
5 files changed, 18 insertions, 5 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py index 8cbbca12a14..1ffd8cbc75c 100644 --- a/meta/lib/oeqa/sdk/cases/buildcvs.py +++ b/meta/lib/oeqa/sdk/cases/buildcvs.py @@ -15,7 +15,10 @@ class BuildCvsTest(OESDKTestCase): self.project.download_archive() machine = self.td.get("MACHINE") - if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % 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")): raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") def test_cvs(self): diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py index 0bd00d125a9..621fb55fc5b 100644 --- a/meta/lib/oeqa/sdk/cases/buildiptables.py +++ b/meta/lib/oeqa/sdk/cases/buildiptables.py @@ -17,7 +17,10 @@ class BuildIptablesTest(OESDKTestCase): machine = self.td.get("MACHINE") - if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % 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")): 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 74ad2a2f2b9..d8692472bed 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py @@ -18,7 +18,8 @@ class GccCompileTest(OESDKTestCase): def setUp(self): machine = self.td.get("MACHINE") - if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine): + if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or + self.tc.hasHostPackage("gcc-runtime")): raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain") def test_gcc_compile(self): diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py index e1bded2ff2a..6f22ceba8ef 100644 --- a/meta/lib/oeqa/sdk/cases/perl.py +++ b/meta/lib/oeqa/sdk/cases/perl.py @@ -8,7 +8,10 @@ from oeqa.sdk.case import OESDKTestCase class PerlTest(OESDKTestCase): @classmethod def setUpClass(self): - if not self.tc.hasHostPackage("nativesdk-perl"): + if not (self.tc.hasHostPackage("nativesdk-perl") or + self.tc.hasHostPackage("perl-native") or + self.tc.hasHostPackage("libperl5") or + self.tc.hasHostPackage("perl")): raise unittest.SkipTest("No perl package in the SDK") for f in ['test.pl']: diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index 94a296f0ec9..1628787a6bb 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py @@ -8,7 +8,10 @@ from oeqa.sdk.case import OESDKTestCase class PythonTest(OESDKTestCase): @classmethod def setUpClass(self): - if not self.tc.hasHostPackage("nativesdk-python"): + if not (self.tc.hasHostPackage("nativesdk-python") or + self.tc.hasHostPackage("python-smartpm-native") or + self.tc.hasHostPackage("python3-native") or + self.tc.hasHostPackage("python-native")): raise unittest.SkipTest("No python package in the SDK") for f in ['test.py']: |