sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Aníbal Limón 2016-11-29 18:12:49 -06:00 committed by Richard Purdie
parent c9fe59d7c5
commit 3fac2417dd
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/testsdk.bbclass
View File

@ -14,7 +14,6 @@
#
# where "<image-name>" is an image like core-image-sato.
TEST_LOG_DIR ?= "${WORKDIR}/testimage"
TESTSDKLOCK = "${TMPDIR}/testsdk.lock"
def run_test_context(CTestContext, d, testdir, tcname, pn, *args):
@ -65,17 +64,12 @@ def testsdk_main(d):
# sdk use network for download projects for build
export_proxies(d)
test_log_dir = d.getVar("TEST_LOG_DIR", True)
bb.utils.mkdirhier(test_log_dir)
tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh")
if not os.path.exists(tcname):
bb.fatal("The toolchain %s is not built. Build it before running the tests: 'bitbake <image> -c populate_sdk' ." % tcname)
tdname = d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.testdata.json")
test_data = json.load(open(tdname, "r"))
test_data['TEST_LOG_DIR'] = test_log_dir
target_pkg_manifest = OESDKTestContextExecutor._load_manifest(
d.expand("${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.target.manifest"))

4
meta/lib/oeqa/sdk/cases/buildcvs.py
View File

@ -2,7 +2,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class BuildCvsTest(OESDKTestCase):
td_vars = ['TEST_LOG_DIR', 'DATETIME']
td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@ -10,7 +10,7 @@ class BuildCvsTest(OESDKTestCase):
self.project = SDKBuildProject(self.tc.sdk_dir + "/cvs/", self.tc.sdk_env,
"http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_cvs(self):

4
meta/lib/oeqa/sdk/cases/buildgalculator.py
View File

@ -4,7 +4,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class GalculatorTest(OESDKTestCase):
td_vars = ['TEST_LOG_DIR', 'DATETIME']
td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@ -19,7 +19,7 @@ class GalculatorTest(OESDKTestCase):
project = SDKBuildProject(self.tc.sdk_dir + "/galculator/",
self.tc.sdk_env,
"http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
project.download_archive()

4
meta/lib/oeqa/sdk/cases/buildiptables.py
View File

@ -2,7 +2,7 @@ from oeqa.sdk.case import OESDKTestCase
from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
class BuildIptablesTest(OESDKTestCase):
td_vars = ['TEST_LOG_DIR', 'DATETIME']
td_vars = ['DATETIME']
@classmethod
def setUpClass(self):
@ -10,7 +10,7 @@ class BuildIptablesTest(OESDKTestCase):
self.project = SDKBuildProject(self.tc.sdk_dir + "/iptables/", self.tc.sdk_env,
"http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir)
self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
self.project.download_archive()
def test_iptables(self):