diff options
Diffstat (limited to 'meta/classes/testsdk.bbclass')
| -rw-r--r-- | meta/classes/testsdk.bbclass | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 75b40271fa..6a201aa41b 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -14,8 +14,6 @@ # # where "<image-name>" is an image like core-image-sato. -TESTSDKLOCK = "${TMPDIR}/testsdk.lock" - def testsdk_main(d): import os import subprocess @@ -89,9 +87,6 @@ python do_testsdk() { } addtask testsdk do_testsdk[nostamp] = "1" -do_testsdk[lockfiles] += "${TESTSDKLOCK}" - -TESTSDKEXTLOCK = "${TMPDIR}/testsdkext.lock" def testsdkext_main(d): import os @@ -100,7 +95,7 @@ def testsdkext_main(d): import logging from bb.utils import export_proxies - from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible + from oeqa.utils import avoid_paths_in_environ, make_logger_bitbake_compatible, subprocesstweak from oeqa.sdkext.context import OESDKExtTestContext, OESDKExtTestContextExecutor pn = d.getVar("PN") @@ -109,6 +104,8 @@ def testsdkext_main(d): # extensible sdk use network export_proxies(d) + 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'), @@ -149,6 +146,18 @@ def testsdkext_main(d): bb.plain("Extensible SDK testing environment: %s" % s) sdk_env = sdk_envs[s] + + # Use our own SSTATE_DIR and DL_DIR so that updates to the eSDK come from our sstate cache + # 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('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) + f.write('INHERIT += "own-mirrors"') + + # We need to do this in case we have a minimal SDK + subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % sdk_env, cwd=sdk_dir, shell=True) + tc = OESDKExtTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir, sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest, host_pkg_manifest=host_pkg_manifest) @@ -180,4 +189,4 @@ python do_testsdkext() { } addtask testsdkext do_testsdkext[nostamp] = "1" -do_testsdkext[lockfiles] += "${TESTSDKEXTLOCK}" + |