diff options
Diffstat (limited to 'meta/lib/oeqa/sdkext/testsdk.py')
-rw-r--r-- | meta/lib/oeqa/sdkext/testsdk.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index ffd185ec55..9d5a99d900 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py | |||
@@ -16,6 +16,7 @@ class TestSDKExt(TestSDKBase): | |||
16 | from bb.utils import export_proxies | 16 | from bb.utils import export_proxies |
17 | from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible, subprocesstweak | 17 | from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible, subprocesstweak |
18 | from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor | 18 | from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor |
19 | from oeqa.utils import get_json_result_dir | ||
19 | 20 | ||
20 | pn = d.getVar("PN") | 21 | pn = d.getVar("PN") |
21 | logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) | 22 | logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) |
@@ -67,10 +68,10 @@ class TestSDKExt(TestSDKBase): | |||
67 | # and we don't spend hours downloading kernels for the kernel module test | 68 | # and we don't spend hours downloading kernels for the kernel module test |
68 | # Abuse auto.conf since local.conf would be overwritten by the SDK | 69 | # Abuse auto.conf since local.conf would be overwritten by the SDK |
69 | with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f: | 70 | with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f: |
70 | f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) | 71 | f.write('SSTATE_MIRRORS += "file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) |
71 | f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) | 72 | f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) |
72 | f.write('INHERIT += "own-mirrors"\n') | 73 | f.write('INHERIT += "own-mirrors"\n') |
73 | f.write('PREMIRRORS_prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR')) | 74 | f.write('PREMIRRORS:prepend = "git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME "\n' % test_data.get('DL_DIR')) |
74 | 75 | ||
75 | # We need to do this in case we have a minimal SDK | 76 | # We need to do this in case we have a minimal SDK |
76 | subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ | 77 | subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ |
@@ -91,7 +92,7 @@ class TestSDKExt(TestSDKBase): | |||
91 | component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) | 92 | component = "%s %s" % (pn, OESDKExtTestContextExecutor.name) |
92 | context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) | 93 | context_msg = "%s:%s" % (os.path.basename(tcname), os.path.basename(sdk_env)) |
93 | configuration = self.get_sdk_configuration(d, 'sdkext') | 94 | configuration = self.get_sdk_configuration(d, 'sdkext') |
94 | result.logDetails(self.get_sdk_json_result_dir(d), | 95 | result.logDetails(get_json_result_dir(d), |
95 | configuration, | 96 | configuration, |
96 | self.get_sdk_result_id(configuration)) | 97 | self.get_sdk_result_id(configuration)) |
97 | result.logSummary(component, context_msg) | 98 | result.logSummary(component, context_msg) |