diff options
Diffstat (limited to 'meta/lib/oeqa/sdkext')
| -rw-r--r-- | meta/lib/oeqa/sdkext/case.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdkext/cases/devtool.py | 31 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdkext/context.py | 5 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdkext/testsdk.py | 22 |
4 files changed, 37 insertions, 26 deletions
diff --git a/meta/lib/oeqa/sdkext/case.py b/meta/lib/oeqa/sdkext/case.py index 21b718831c..668faec9b9 100644 --- a/meta/lib/oeqa/sdkext/case.py +++ b/meta/lib/oeqa/sdkext/case.py @@ -1,5 +1,8 @@ +# # Copyright (C) 2016 Intel Corporation -# Released under the MIT license (see COPYING.MIT) +# +# SPDX-License-Identifier: MIT +# import os import subprocess diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index d322f86c73..d0746e68eb 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -1,12 +1,14 @@ +# # Copyright (C) 2016 Intel Corporation -# Released under the MIT license (see COPYING.MIT) +# +# SPDX-License-Identifier: MIT +# import os import shutil import subprocess from oeqa.sdkext.case import OESDKExtTestCase -from oeqa.core.decorator.oeid import OETestID from oeqa.utils.httpserver import HTTPService from oeqa.utils.subprocesstweak import errors_have_output @@ -18,10 +20,16 @@ class DevtoolTest(OESDKExtTestCase): myapp_src = os.path.join(cls.tc.esdk_files_dir, "myapp") cls.myapp_dst = os.path.join(cls.tc.sdk_dir, "myapp") shutil.copytree(myapp_src, cls.myapp_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_dst) 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(myapp_cmake_src, cls.myapp_cmake_dst) + subprocess.check_output(['git', 'init', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'add', '.'], cwd=cls.myapp_cmake_dst) + subprocess.check_output(['git', 'commit', '-m', "'test commit'"], cwd=cls.myapp_cmake_dst) @classmethod def tearDownClass(cls): @@ -51,40 +59,33 @@ class DevtoolTest(OESDKExtTestCase): self._run('devtool add myapp %s' % self.myapp_dst) self._run('devtool reset myapp') - @OETestID(1605) def test_devtool_build_make(self): self._test_devtool_build(self.myapp_dst) - @OETestID(1606) def test_devtool_build_esdk_package(self): self._test_devtool_build_package(self.myapp_dst) - @OETestID(1607) def test_devtool_build_cmake(self): self._test_devtool_build(self.myapp_cmake_dst) - @OETestID(1608) def test_extend_autotools_recipe_creation(self): - req = 'https://github.com/rdfa/librdfa' - recipe = "librdfa" - self._run('devtool sdk-install libxml2') - self._run('devtool add %s %s' % (recipe, req) ) + recipe = "test-dbus-wait" + self._run('devtool sdk-install dbus') + self._run('devtool add %s https://git.yoctoproject.org/git/dbus-wait' % (recipe) ) try: self._run('devtool build %s' % recipe) finally: self._run('devtool reset %s' % recipe) - @OETestID(1609) def test_devtool_kernelmodule(self): - docfile = 'https://github.com/umlaeute/v4l2loopback.git' - recipe = 'v4l2loopback-driver' + docfile = 'https://git.yoctoproject.org/git/kernel-module-hello-world' + recipe = 'kernel-module-hello-world' self._run('devtool add %s %s' % (recipe, docfile) ) try: self._run('devtool build %s' % recipe) finally: self._run('devtool reset %s' % recipe) - @OETestID(1610) 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) @@ -110,7 +111,7 @@ class SdkUpdateTest(OESDKExtTestCase): cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) subprocess.check_output(cmd, shell=True) - self.http_service = HTTPService(self.publish_dir) + self.http_service = HTTPService(self.publish_dir, logger=self.logger) self.http_service.start() self.http_url = "http://127.0.0.1:%d" % self.http_service.port diff --git a/meta/lib/oeqa/sdkext/context.py b/meta/lib/oeqa/sdkext/context.py index 65da4c6e1b..2ac2bf6ff7 100644 --- a/meta/lib/oeqa/sdkext/context.py +++ b/meta/lib/oeqa/sdkext/context.py @@ -1,5 +1,8 @@ +# # Copyright (C) 2016 Intel Corporation -# Released under the MIT license (see COPYING.MIT) +# +# SPDX-License-Identifier: MIT +# import os from oeqa.sdk.context import OESDKTestContext, OESDKTestContextExecutor diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 57b2e0e03f..9d5a99d900 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py @@ -1,5 +1,8 @@ +# # Copyright 2018 by Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT) +# +# SPDX-License-Identifier: MIT +# from oeqa.sdk.testsdk import TestSDKBase @@ -13,6 +16,7 @@ class TestSDKExt(TestSDKBase): from bb.utils import export_proxies from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible, subprocesstweak from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor + from oeqa.utils import get_json_result_dir pn = d.getVar("PN") logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) @@ -22,11 +26,8 @@ class TestSDKExt(TestSDKBase): subprocesstweak.errors_have_output() - # extensible sdk can be contaminated if native programs are - # in PATH, i.e. use perl-native instead of eSDK one. - paths_to_avoid = [d.getVar('STAGING_DIR'), - d.getVar('BASE_WORKDIR')] - os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) + # We need the original PATH for testing the eSDK, not with our manipulations + os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") if not os.path.exists(tcname): @@ -67,10 +68,10 @@ class TestSDKExt(TestSDKBase): # and we don't spend hours downloading kernels for the kernel module test # Abuse auto.conf since local.conf would be overwritten by the SDK with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f: - f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) + f.write('SSTATE_MIRRORS += "file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) f.write('INHERIT += "own-mirrors"\n') - f.write('PREMIRRORS_prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR')) + f.write('PREMIRRORS:prepend = "git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME "\n' % test_data.get('DL_DIR')) # We need to do this in case we have a minimal SDK subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ @@ -91,7 +92,7 @@ class TestSDKExt(TestSDKBase): component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) configuration = self.get_sdk_configuration(d, 'sdkext') - result.logDetails(self.get_sdk_json_result_dir(d), + result.logDetails(get_json_result_dir(d), configuration, self.get_sdk_result_id(configuration)) result.logSummary(component, context_msg) @@ -99,6 +100,9 @@ class TestSDKExt(TestSDKBase): if not result.wasSuccessful(): fail = True + # Clean the workspace/sources to avoid `devtool add' failure because of non-empty source directory + bb.utils.remove(sdk_dir+'workspace/sources', True) + if fail: bb.fatal("%s - FAILED - check the task log and the commands log" % pn) |