summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Pedraza <francisco.j.pedraza.gonzalez@intel.com>2017-01-25 11:07:34 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commitaca3afcb592ef4ff070760ab2aafba03152a57fb (patch)
tree3f373c82dc2449befb12eb1f8a74b4f48b769382
parent2e77eff6ccba84b5229971794a31122dfa033e07 (diff)
downloadpoky-aca3afcb592ef4ff070760ab2aafba03152a57fb.tar.gz
oeqa/sdk: Updates sanity tests for minimal eSDK
Updates sanity tests to cope with minimal eSDK installer 1. Skips the validation of sanity if packagegroup-cross-canadian is in host package. 2. Skips if SDK does not include toolchain at cases/devtool.py This should fix [YOCTO #10794] (From OE-Core rev: 59a99cd8661af594ee0c33e086578d29d50a6268) Signed-off-by: Francisco Pedraza <francisco.j.pedraza.gonzalez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdk/cases/buildcvs.py5
-rw-r--r--meta/lib/oeqa/sdk/cases/buildiptables.py7
-rw-r--r--meta/lib/oeqa/sdkext/cases/devtool.py7
3 files changed, 19 insertions, 0 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py
index 6222a8e2bf..8cbbca12a1 100644
--- a/meta/lib/oeqa/sdk/cases/buildcvs.py
+++ b/meta/lib/oeqa/sdk/cases/buildcvs.py
@@ -1,3 +1,4 @@
1import unittest
1from oeqa.sdk.case import OESDKTestCase 2from oeqa.sdk.case import OESDKTestCase
2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 3from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
3 4
@@ -13,6 +14,10 @@ class BuildCvsTest(OESDKTestCase):
13 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir) 14 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
14 self.project.download_archive() 15 self.project.download_archive()
15 16
17 machine = self.td.get("MACHINE")
18 if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine):
19 raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain")
20
16 def test_cvs(self): 21 def test_cvs(self):
17 self.assertEqual(self.project.run_configure(), 0, 22 self.assertEqual(self.project.run_configure(), 0,
18 msg="Running configure failed") 23 msg="Running configure failed")
diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py
index 532b5de8e6..0bd00d125a 100644
--- a/meta/lib/oeqa/sdk/cases/buildiptables.py
+++ b/meta/lib/oeqa/sdk/cases/buildiptables.py
@@ -1,6 +1,8 @@
1import unittest
1from oeqa.sdk.case import OESDKTestCase 2from oeqa.sdk.case import OESDKTestCase
2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 3from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
3 4
5
4class BuildIptablesTest(OESDKTestCase): 6class BuildIptablesTest(OESDKTestCase):
5 td_vars = ['DATETIME'] 7 td_vars = ['DATETIME']
6 8
@@ -13,6 +15,11 @@ class BuildIptablesTest(OESDKTestCase):
13 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir) 15 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
14 self.project.download_archive() 16 self.project.download_archive()
15 17
18 machine = self.td.get("MACHINE")
19
20 if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine):
21 raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain")
22
16 def test_iptables(self): 23 def test_iptables(self):
17 self.assertEqual(self.project.run_configure(), 0, 24 self.assertEqual(self.project.run_configure(), 0,
18 msg="Running configure failed") 25 msg="Running configure failed")
diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py
index da0050c606..eda0d8122b 100644
--- a/meta/lib/oeqa/sdkext/cases/devtool.py
+++ b/meta/lib/oeqa/sdkext/cases/devtool.py
@@ -7,6 +7,7 @@ import subprocess
7from oeqa.sdkext.case import OESDKExtTestCase 7from oeqa.sdkext.case import OESDKExtTestCase
8from oeqa.core.decorator.depends import OETestDepends 8from oeqa.core.decorator.depends import OETestDepends
9from oeqa.core.decorator.oeid import OETestID 9from oeqa.core.decorator.oeid import OETestID
10from oeqa.core.decorator.data import skipIfNotDataVar
10 11
11class DevtoolTest(OESDKExtTestCase): 12class DevtoolTest(OESDKExtTestCase):
12 @classmethod 13 @classmethod
@@ -51,21 +52,25 @@ class DevtoolTest(OESDKExtTestCase):
51 52
52 @OETestID(1473) 53 @OETestID(1473)
53 @OETestDepends(['test_devtool_location']) 54 @OETestDepends(['test_devtool_location'])
55 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
54 def test_devtool_build_make(self): 56 def test_devtool_build_make(self):
55 self._test_devtool_build(self.myapp_dst) 57 self._test_devtool_build(self.myapp_dst)
56 58
57 @OETestID(1474) 59 @OETestID(1474)
58 @OETestDepends(['test_devtool_location']) 60 @OETestDepends(['test_devtool_location'])
61 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
59 def test_devtool_build_esdk_package(self): 62 def test_devtool_build_esdk_package(self):
60 self._test_devtool_build_package(self.myapp_dst) 63 self._test_devtool_build_package(self.myapp_dst)
61 64
62 @OETestID(1479) 65 @OETestID(1479)
63 @OETestDepends(['test_devtool_location']) 66 @OETestDepends(['test_devtool_location'])
67 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
64 def test_devtool_build_cmake(self): 68 def test_devtool_build_cmake(self):
65 self._test_devtool_build(self.myapp_cmake_dst) 69 self._test_devtool_build(self.myapp_cmake_dst)
66 70
67 @OETestID(1482) 71 @OETestID(1482)
68 @OETestDepends(['test_devtool_location']) 72 @OETestDepends(['test_devtool_location'])
73 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
69 def test_extend_autotools_recipe_creation(self): 74 def test_extend_autotools_recipe_creation(self):
70 req = 'https://github.com/rdfa/librdfa' 75 req = 'https://github.com/rdfa/librdfa'
71 recipe = "bbexample" 76 recipe = "bbexample"
@@ -80,6 +85,7 @@ class DevtoolTest(OESDKExtTestCase):
80 85
81 @OETestID(1484) 86 @OETestID(1484)
82 @OETestDepends(['test_devtool_location']) 87 @OETestDepends(['test_devtool_location'])
88 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
83 def test_devtool_kernelmodule(self): 89 def test_devtool_kernelmodule(self):
84 docfile = 'https://github.com/umlaeute/v4l2loopback.git' 90 docfile = 'https://github.com/umlaeute/v4l2loopback.git'
85 recipe = 'v4l2loopback-driver' 91 recipe = 'v4l2loopback-driver'
@@ -94,6 +100,7 @@ class DevtoolTest(OESDKExtTestCase):
94 100
95 @OETestID(1478) 101 @OETestID(1478)
96 @OETestDepends(['test_devtool_location']) 102 @OETestDepends(['test_devtool_location'])
103 @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
97 def test_recipes_for_nodejs(self): 104 def test_recipes_for_nodejs(self):
98 package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0" 105 package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0"
99 self._run('devtool add %s ' % package_nodejs) 106 self._run('devtool add %s ' % package_nodejs)