diff options
| -rw-r--r-- | meta/classes/testsdk.bbclass | 6 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildcvs.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildgalculator.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/buildiptables.py | 4 |
4 files changed, 6 insertions, 12 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 @@ # # 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")) diff --git a/meta/lib/oeqa/sdk/cases/buildcvs.py b/meta/lib/oeqa/sdk/cases/buildcvs.py index ee7fb73803..6222a8e2bf 100644 --- a/meta/lib/oeqa/sdk/cases/buildcvs.py +++ b/meta/lib/oeqa/sdk/cases/buildcvs.py @@ -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): diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py index d2c1189ce6..bdc8b6ac87 100644 --- a/meta/lib/oeqa/sdk/cases/buildgalculator.py +++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py @@ -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() diff --git a/meta/lib/oeqa/sdk/cases/buildiptables.py b/meta/lib/oeqa/sdk/cases/buildiptables.py index a50fb5dcf5..532b5de8e6 100644 --- a/meta/lib/oeqa/sdk/cases/buildiptables.py +++ b/meta/lib/oeqa/sdk/cases/buildiptables.py @@ -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): |