[oe-commits] [openembedded-core] 06/06: fixups
git at git.openembedded.org
git at git.openembedded.org
Wed Mar 1 11:19:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit cc9253c495d4340165e4a22a8bda57d9abccc685
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Mar 1 11:07:30 2017 +0000
fixups
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/sdk/cases/gcc.py | 5 ---
meta/lib/oeqa/sdkext/cases/devtool.py | 76 ++++++++++++++++-------------------
2 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py
index 74ad2a2..d17ccd2 100644
--- a/meta/lib/oeqa/sdk/cases/gcc.py
+++ b/meta/lib/oeqa/sdk/cases/gcc.py
@@ -16,11 +16,6 @@ class GccCompileTest(OESDKTestCase):
shutil.copyfile(os.path.join(files[f], f),
os.path.join(self.tc.sdk_dir, f))
- def setUp(self):
- machine = self.td.get("MACHINE")
- if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine):
- raise unittest.SkipTest("GccCompileTest class: SDK doesn't contain a cross-canadian toolchain")
-
def test_gcc_compile(self):
self._run('$CC %s/test.c -o %s/test -lm' % (self.tc.sdk_dir, self.tc.sdk_dir))
diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py
index baa528f..45deea7 100644
--- a/meta/lib/oeqa/sdkext/cases/devtool.py
+++ b/meta/lib/oeqa/sdkext/cases/devtool.py
@@ -7,112 +7,104 @@ import subprocess
from oeqa.sdkext.case import OESDKExtTestCase
from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.oeid import OETestID
-from oeqa.core.decorator.data import skipIfNotDataVar
class DevtoolTest(OESDKExtTestCase):
@classmethod
- def setUpClass(self):
- self.myapp_src = os.path.join(self.tc.esdk_files_dir, "myapp")
- self.myapp_dst = os.path.join(self.tc.sdk_dir, "myapp")
- shutil.copytree(self.myapp_src, self.myapp_dst)
+ def setUpClass(cls):
+ cls.myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp")
+ cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp")
+ shutil.copytree(cls.myapp_src, cls.myapp_dst)
- self.myapp_cmake_src = os.path.join(self.tc.esdk_files_dir, "myapp_cmake")
- self.myapp_cmake_dst = os.path.join(self.tc.sdk_dir, "myapp_cmake")
- shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst)
+ cls.myapp_cmake_src = os.path.join(cls.tc.esdk_files_dir, "myapp_cmake")
+ cls.myapp_cmake_dst = os.path.join(cls.tc.sdk_dir, "myapp_cmake")
+ shutil.copytree(cls.myapp_cmake_src, cls.myapp_cmake_dst)
+
+ @classmethod
+ def tearDownClass(cls):
+ shutil.rmtree(cls.myapp_dst)
+ shutil.rmtree(cls.myapp_cmake_dst)
def _test_devtool_build(self, directory):
self._run('devtool add myapp %s' % directory)
try:
self._run('devtool build myapp')
- except Exception as e:
+ except subprocess.CalledProcessError as e:
print(e.output)
- self._run('devtool reset myapp')
raise e
- self._run('devtool reset myapp')
+ finally:
+ self._run('devtool reset myapp')
def _test_devtool_build_package(self, directory):
self._run('devtool add myapp %s' % directory)
try:
self._run('devtool package myapp')
- except Exception as e:
+ except subprocess.CalledProcessError as e:
print(e.output)
- self._run('devtool reset myapp')
raise e
- self._run('devtool reset myapp')
+ finally:
+ self._run('devtool reset myapp')
def test_devtool_location(self):
output = self._run('which devtool')
self.assertEqual(output.startswith(self.tc.sdk_dir), True, \
msg="Seems that devtool isn't the eSDK one: %s" % output)
-
+
@OETestDepends(['test_devtool_location'])
def test_devtool_add_reset(self):
self._run('devtool add myapp %s' % self.myapp_dst)
self._run('devtool reset myapp')
-
+
@OETestID(1605)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_build_make(self):
self._test_devtool_build(self.myapp_dst)
-
+
@OETestID(1606)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_build_esdk_package(self):
self._test_devtool_build_package(self.myapp_dst)
@OETestID(1607)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_build_cmake(self):
self._test_devtool_build(self.myapp_cmake_dst)
-
+
@OETestID(1608)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_extend_autotools_recipe_creation(self):
- req = 'https://github.com/rdfa/librdfa'
- recipe = "librdfa"
- self._run('devtool add %s %s' % (recipe, req) )
try:
- self._run('devtool build %s' % recipe)
- except Exception as e:
+ self._run('devtool sdk-install libxml2')
+ self._run('devtool add librdfa https://github.com/rdfa/librdfa')
+ self._run('devtool build librdfa')
+ except subprocess.CalledProcessError as e:
print(e.output)
- self._run('devtool reset %s' % recipe)
raise e
- self._run('devtool reset %s' % recipe)
+ finally:
+ self._run('devtool reset librdfa')
@OETestID(1609)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_devtool_kernelmodule(self):
docfile = 'https://github.com/umlaeute/v4l2loopback.git'
recipe = 'v4l2loopback-driver'
self._run('devtool add %s %s' % (recipe, docfile) )
try:
self._run('devtool build %s' % recipe)
- except Exception as e:
+ except subprocess.CalledProcessError as e:
print(e.output)
- self._run('devtool reset %s' % recipe)
raise e
- self._run('devtool reset %s' % recipe)
+ finally:
+ self._run('devtool reset %s' % recipe)
@OETestID(1610)
@OETestDepends(['test_devtool_location'])
- @skipIfNotDataVar('SDK_INCLUDE_TOOLCHAIN', '1', 'SDK does not include toolchain')
def test_recipes_for_nodejs(self):
package_nodejs = "npm://registry.npmjs.org;name=winston;version=2.2.0"
self._run('devtool add %s ' % package_nodejs)
try:
self._run('devtool build %s ' % package_nodejs)
- except Exception as e:
+ except subprocess.CalledProcessError as e:
print(e.output)
- self._run('devtool reset %s' % package_nodejs)
raise e
- self._run('devtool reset %s '% package_nodejs)
-
- @classmethod
- def tearDownClass(self):
- shutil.rmtree(self.myapp_dst)
- shutil.rmtree(self.myapp_cmake_dst)
+ finally:
+ self._run('devtool reset %s '% package_nodejs)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list