diff options
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildgalculator.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/gcc.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdkext/cases/devtool.py | 49 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdkext/cases/sdk_update.py | 17 |
4 files changed, 38 insertions, 33 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py index bdc8b6ac87..42e8ddb185 100644 --- a/meta/lib/oeqa/sdk/cases/buildgalculator.py +++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py @@ -10,7 +10,7 @@ class GalculatorTest(OESDKTestCase): def setUpClass(self): if not (self.tc.hasTargetPackage("gtk+3") or\ self.tc.hasTargetPackage("libgtk-3.0")): - raise unittest.SkipTest("%s class: SDK don't support gtk+3" % self.__name__) + raise unittest.SkipTest("GalculatorTest class: SDK don't support gtk+3") def test_galculator(self): dl_dir = self.td.get('DL_DIR', None) diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index e06af4c247..74ad2a2f2b 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py @@ -19,8 +19,7 @@ class GccCompileTest(OESDKTestCase): def setUp(self): machine = self.td.get("MACHINE") if not self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine): - raise unittest.SkipTest("%s class: SDK doesn't contain a cross-canadian toolchain", - self.__name__) + 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 65f41f6875..da0050c606 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -1,18 +1,22 @@ +# Copyright (C) 2016 Intel Corporation +# Released under the MIT license (see COPYING.MIT) + import shutil import subprocess -import urllib.request -from oeqa.oetest import oeSDKExtTest -from oeqa.utils.decorators import * -class DevtoolTest(oeSDKExtTest): +from oeqa.sdkext.case import OESDKExtTestCase +from oeqa.core.decorator.depends import OETestDepends +from oeqa.core.decorator.oeid import OETestID + +class DevtoolTest(OESDKExtTestCase): @classmethod def setUpClass(self): - self.myapp_src = os.path.join(self.tc.sdkextfilesdir, "myapp") - self.myapp_dst = os.path.join(self.tc.sdktestdir, "myapp") + 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) - self.myapp_cmake_src = os.path.join(self.tc.sdkextfilesdir, "myapp_cmake") - self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake") + 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) def _test_devtool_build(self, directory): @@ -37,31 +41,31 @@ class DevtoolTest(oeSDKExtTest): def test_devtool_location(self): output = self._run('which devtool') - self.assertEqual(output.startswith(self.tc.sdktestdir), True, \ + self.assertEqual(output.startswith(self.tc.sdk_dir), True, \ msg="Seems that devtool isn't the eSDK one: %s" % output) - @skipUnlessPassed('test_devtool_location') + @OETestDepends(['test_devtool_location']) def test_devtool_add_reset(self): self._run('devtool add myapp %s' % self.myapp_dst) self._run('devtool reset myapp') - @testcase(1473) - @skipUnlessPassed('test_devtool_location') + @OETestID(1473) + @OETestDepends(['test_devtool_location']) def test_devtool_build_make(self): self._test_devtool_build(self.myapp_dst) - @testcase(1474) - @skipUnlessPassed('test_devtool_location') + @OETestID(1474) + @OETestDepends(['test_devtool_location']) def test_devtool_build_esdk_package(self): self._test_devtool_build_package(self.myapp_dst) - @testcase(1479) - @skipUnlessPassed('test_devtool_location') + @OETestID(1479) + @OETestDepends(['test_devtool_location']) def test_devtool_build_cmake(self): self._test_devtool_build(self.myapp_cmake_dst) - @testcase(1482) - @skipUnlessPassed('test_devtool_location') + @OETestID(1482) + @OETestDepends(['test_devtool_location']) def test_extend_autotools_recipe_creation(self): req = 'https://github.com/rdfa/librdfa' recipe = "bbexample" @@ -74,8 +78,8 @@ class DevtoolTest(oeSDKExtTest): raise e self._run('devtool reset %s' % recipe) - @testcase(1484) - @skipUnlessPassed('test_devtool_location') + @OETestID(1484) + @OETestDepends(['test_devtool_location']) def test_devtool_kernelmodule(self): docfile = 'https://github.com/umlaeute/v4l2loopback.git' recipe = 'v4l2loopback-driver' @@ -88,8 +92,8 @@ class DevtoolTest(oeSDKExtTest): raise e self._run('devtool reset %s' % recipe) - @testcase(1478) - @skipUnlessPassed('test_devtool_location') + @OETestID(1478) + @OETestDepends(['test_devtool_location']) 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) @@ -101,7 +105,6 @@ class DevtoolTest(oeSDKExtTest): raise e self._run('devtool reset %s '% package_nodejs) - @classmethod def tearDownClass(self): shutil.rmtree(self.myapp_dst) diff --git a/meta/lib/oeqa/sdkext/cases/sdk_update.py b/meta/lib/oeqa/sdkext/cases/sdk_update.py index 2ade839c05..2f8598bbe5 100644 --- a/meta/lib/oeqa/sdkext/cases/sdk_update.py +++ b/meta/lib/oeqa/sdkext/cases/sdk_update.py @@ -1,23 +1,26 @@ +# Copyright (C) 2016 Intel Corporation +# Released under the MIT license (see COPYING.MIT) + import os import shutil import subprocess -from oeqa.oetest import oeSDKExtTest +from oeqa.sdkext.case import OESDKExtTestCase from oeqa.utils.httpserver import HTTPService -class SdkUpdateTest(oeSDKExtTest): - +class SdkUpdateTest(OESDKExtTestCase): @classmethod def setUpClass(self): - self.publish_dir = os.path.join(self.tc.sdktestdir, 'esdk_publish') + self.publish_dir = os.path.join(self.tc.sdk_dir, 'esdk_publish') if os.path.exists(self.publish_dir): shutil.rmtree(self.publish_dir) os.mkdir(self.publish_dir) - tcname_new = self.tc.d.expand( - "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}-new.sh") + base_tcname = "%s/%s" % (self.td.get("SDK_DEPLOY", ''), + self.td.get("TOOLCHAINEXT_OUTPUTNAME", '')) + tcname_new = "%s-new.sh" % base_tcname if not os.path.exists(tcname_new): - tcname_new = self.tc.tcname + tcname_new = "%s.sh" % base_tcname cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) subprocess.check_output(cmd, shell=True) |