diff options
Diffstat (limited to 'meta/lib/oeqa/sdk')
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildiptables.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/gcc.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/perl.py | 3 | ||||
-rw-r--r-- | meta/lib/oeqa/sdk/cases/python.py | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py index 0bd00d125a..419c7ebd09 100644 --- a/meta/lib/oeqa/sdk/cases/buildiptables.py +++ b/meta/lib/oeqa/sdk/cases/buildiptables.py | |||
@@ -17,7 +17,8 @@ class BuildIptablesTest(OESDKTestCase): | |||
17 | 17 | ||
18 | machine = self.td.get("MACHINE") | 18 | machine = self.td.get("MACHINE") |
19 | 19 | ||
20 | if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine): | 20 | if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or |
21 | self.tc.hasTargetPackage("gcc")): | ||
21 | raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") | 22 | raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") |
22 | 23 | ||
23 | def test_iptables(self): | 24 | def test_iptables(self): |
diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index 74ad2a2f2b..d11f4b63fb 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py | |||
@@ -18,7 +18,8 @@ class GccCompileTest(OESDKTestCase): | |||
18 | 18 | ||
19 | def setUp(self): | 19 | def setUp(self): |
20 | machine = self.td.get("MACHINE") | 20 | machine = self.td.get("MACHINE") |
21 | if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine): | 21 | if not (self.tc.hasTargetPackage("packagegroup-cross-canadian-%s" % machine) or |
22 | self.tc.hasTargetPackage("gcc")): | ||
22 | raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain") | 23 | raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain") |
23 | 24 | ||
24 | def test_gcc_compile(self): | 25 | def test_gcc_compile(self): |
diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py index e1bded2ff2..8085678116 100644 --- a/meta/lib/oeqa/sdk/cases/perl.py +++ b/meta/lib/oeqa/sdk/cases/perl.py | |||
@@ -8,7 +8,8 @@ from oeqa.sdk.case import OESDKTestCase | |||
8 | class PerlTest(OESDKTestCase): | 8 | class PerlTest(OESDKTestCase): |
9 | @classmethod | 9 | @classmethod |
10 | def setUpClass(self): | 10 | def setUpClass(self): |
11 | if not self.tc.hasHostPackage("nativesdk-perl"): | 11 | if not (self.tc.hasHostPackage("nativesdk-perl") or |
12 | self.tc.hasHostPackage("perl-native")): | ||
12 | raise unittest.SkipTest("No perl package in the SDK") | 13 | raise unittest.SkipTest("No perl package in the SDK") |
13 | 14 | ||
14 | for f in ['test.pl']: | 15 | for f in ['test.pl']: |
diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index 94a296f0ec..72dfcc72bd 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py | |||
@@ -8,7 +8,8 @@ from oeqa.sdk.case import OESDKTestCase | |||
8 | class PythonTest(OESDKTestCase): | 8 | class PythonTest(OESDKTestCase): |
9 | @classmethod | 9 | @classmethod |
10 | def setUpClass(self): | 10 | def setUpClass(self): |
11 | if not self.tc.hasHostPackage("nativesdk-python"): | 11 | if not (self.tc.hasHostPackage("nativesdk-python") or |
12 | self.tc.hasHostPackage("python-native")): | ||
12 | raise unittest.SkipTest("No python package in the SDK") | 13 | raise unittest.SkipTest("No python package in the SDK") |
13 | 14 | ||
14 | for f in ['test.py']: | 15 | for f in ['test.py']: |