diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/eSDK.py')
-rw-r--r-- | meta/lib/oeqa/selftest/eSDK.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/lib/oeqa/selftest/eSDK.py b/meta/lib/oeqa/selftest/eSDK.py index b68e997ba9..a66ff92140 100644 --- a/meta/lib/oeqa/selftest/eSDK.py +++ b/meta/lib/oeqa/selftest/eSDK.py | |||
@@ -6,9 +6,9 @@ import glob | |||
6 | import logging | 6 | import logging |
7 | import subprocess | 7 | import subprocess |
8 | import oeqa.utils.ftools as ftools | 8 | import oeqa.utils.ftools as ftools |
9 | from oeqa.utils.decorators import testcase | 9 | from oeqa.utils.decorators import testcase |
10 | from oeqa.selftest.base import oeSelfTest | 10 | from oeqa.selftest.base import oeSelfTest |
11 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var | 11 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars |
12 | from oeqa.utils.httpserver import HTTPService | 12 | from oeqa.utils.httpserver import HTTPService |
13 | 13 | ||
14 | class oeSDKExtSelfTest(oeSelfTest): | 14 | class oeSDKExtSelfTest(oeSelfTest): |
@@ -24,7 +24,7 @@ class oeSDKExtSelfTest(oeSelfTest): | |||
24 | # what environment load oe-selftest, i586, x86_64 | 24 | # what environment load oe-selftest, i586, x86_64 |
25 | pattern = os.path.join(tmpdir_eSDKQA, 'environment-setup-*') | 25 | pattern = os.path.join(tmpdir_eSDKQA, 'environment-setup-*') |
26 | return glob.glob(pattern)[0] | 26 | return glob.glob(pattern)[0] |
27 | 27 | ||
28 | @staticmethod | 28 | @staticmethod |
29 | def run_esdk_cmd(env_eSDK, tmpdir_eSDKQA, cmd, postconfig=None, **options): | 29 | def run_esdk_cmd(env_eSDK, tmpdir_eSDKQA, cmd, postconfig=None, **options): |
30 | if postconfig: | 30 | if postconfig: |
@@ -47,10 +47,11 @@ class oeSDKExtSelfTest(oeSelfTest): | |||
47 | def get_eSDK_toolchain(image): | 47 | def get_eSDK_toolchain(image): |
48 | pn_task = '%s -c populate_sdk_ext' % image | 48 | pn_task = '%s -c populate_sdk_ext' % image |
49 | 49 | ||
50 | sdk_deploy = get_bb_var('SDK_DEPLOY', pn_task) | 50 | bb_vars = get_bb_vars(['SDK_DEPLOY', 'TOOLCHAINEXT_OUTPUTNAME'], pn_task) |
51 | toolchain_name = get_bb_var('TOOLCHAINEXT_OUTPUTNAME', pn_task) | 51 | sdk_deploy = bb_vars['SDK_DEPLOY'] |
52 | toolchain_name = bb_vars['TOOLCHAINEXT_OUTPUTNAME'] | ||
52 | return os.path.join(sdk_deploy, toolchain_name + '.sh') | 53 | return os.path.join(sdk_deploy, toolchain_name + '.sh') |
53 | 54 | ||
54 | @staticmethod | 55 | @staticmethod |
55 | def update_configuration(cls, image, tmpdir_eSDKQA, env_eSDK, ext_sdk_path): | 56 | def update_configuration(cls, image, tmpdir_eSDKQA, env_eSDK, ext_sdk_path): |
56 | sstate_dir = os.path.join(os.environ['BUILDDIR'], 'sstate-cache') | 57 | sstate_dir = os.path.join(os.environ['BUILDDIR'], 'sstate-cache') |
@@ -119,7 +120,7 @@ SSTATE_MIRRORS = "file://.* http://%s/PATH" | |||
119 | bitbake(pn_sstate) | 120 | bitbake(pn_sstate) |
120 | cmd = "devtool sdk-install %s " % pn_sstate | 121 | cmd = "devtool sdk-install %s " % pn_sstate |
121 | oeSDKExtSelfTest.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd) | 122 | oeSDKExtSelfTest.run_esdk_cmd(self.env_eSDK, self.tmpdir_eSDKQA, cmd) |
122 | 123 | ||
123 | @testcase(1603) | 124 | @testcase(1603) |
124 | def test_image_generation_binary_feeds(self): | 125 | def test_image_generation_binary_feeds(self): |
125 | image = 'core-image-minimal' | 126 | image = 'core-image-minimal' |