diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2016-11-29 18:12:49 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-23 12:05:19 +0000 |
commit | 3fac2417ddfffb8b32a821ae4b53fabfbb48a8fa (patch) | |
tree | 12865ce397f22343ef4ba34ab4026a3a1ffb1aec /meta/classes/testsdk.bbclass | |
parent | c9fe59d7c5e815fb6453f50d0f15699ea6799129 (diff) | |
download | poky-3fac2417ddfffb8b32a821ae4b53fabfbb48a8fa.tar.gz |
classes/testsdk: Remove the need of TEST_LOG_DIR variable
The TEST_LOG_DIR was used for store sdk_target_log this log
contains the output of the run of build commands now that information
could be found also on log.do_testsdk under WORKDIR.
The log will continue to store into SDK_DIR instead of TEST_LOG_DIR.
(From OE-Core rev: 1c9ba4b698bab916d42b58255692a7bf3d773bbc)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testsdk.bbclass')
-rw-r--r-- | meta/classes/testsdk.bbclass | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 7304129b49..176dafd6b3 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass | |||
@@ -14,7 +14,6 @@ | |||
14 | # | 14 | # |
15 | # where "<image-name>" is an image like core-image-sato. | 15 | # where "<image-name>" is an image like core-image-sato. |
16 | 16 | ||
17 | TEST_LOG_DIR ?= "${WORKDIR}/testimage" | ||
18 | TESTSDKLOCK = "${TMPDIR}/testsdk.lock" | 17 | TESTSDKLOCK = "${TMPDIR}/testsdk.lock" |
19 | 18 | ||
20 | def run_test_context(CTestContext, d, testdir, tcname, pn, *args): | 19 | def run_test_context(CTestContext, d, testdir, tcname, pn, *args): |
@@ -65,17 +64,12 @@ def testsdk_main(d): | |||
65 | # sdk use network for download projects for build | 64 | # sdk use network for download projects for build |
66 | export_proxies(d) | 65 | export_proxies(d) |
67 | 66 | ||
68 | test_log_dir = d.getVar("TEST_LOG_DIR", True) | ||
69 | |||
70 | bb.utils.mkdirhier(test_log_dir) | ||
71 | |||
72 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") | 67 | tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh") |
73 | if not os.path.exists(tcname): | 68 | if not os.path.exists(tcname): |
74 | bb.fatal("The toolchain %s is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' ." % tcname) | 69 | bb.fatal("The toolchain %s is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' ." % tcname) |
75 | 70 | ||
76 | tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json") | 71 | tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json") |
77 | test_data = json.load(open(tdname, "r")) | 72 | test_data = json.load(open(tdname, "r")) |
78 | test_data['TEST_LOG_DIR'] = test_log_dir | ||
79 | 73 | ||
80 | target_pkg_manifest = OESDKTestContextExecutor._load_manifest( | 74 | target_pkg_manifest = OESDKTestContextExecutor._load_manifest( |
81 | d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest")) | 75 | d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest")) |