summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/testsdk.bbclass6
-rw-r--r--meta/lib/oeqa/sdk/cases/buildcvs.py4
-rw-r--r--meta/lib/oeqa/sdk/cases/buildgalculator.py4
-rw-r--r--meta/lib/oeqa/sdk/cases/buildiptables.py4
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 @@
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
17TEST_LOG_DIR ?= "${WORKDIR}/testimage"
18TESTSDKLOCK = "${TMPDIR}/testsdk.lock" 17TESTSDKLOCK = "${TMPDIR}/testsdk.lock"
19 18
20def run_test_context(CTestContext, d, testdir, tcname, pn, *args): 19def 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"))
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
2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
3 3
4class BuildCvsTest(OESDKTestCase): 4class BuildCvsTest(OESDKTestCase):
5 td_vars = ['TEST_LOG_DIR', 'DATETIME'] 5 td_vars = ['DATETIME']
6 6
7 @classmethod 7 @classmethod
8 def setUpClass(self): 8 def setUpClass(self):
@@ -10,7 +10,7 @@ class BuildCvsTest(OESDKTestCase):
10 10
11 self.project = SDKBuildProject(self.tc.sdk_dir + "/cvs/", self.tc.sdk_env, 11 self.project = SDKBuildProject(self.tc.sdk_dir + "/cvs/", self.tc.sdk_env,
12 "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2", 12 "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2",
13 self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir) 13 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
14 self.project.download_archive() 14 self.project.download_archive()
15 15
16 def test_cvs(self): 16 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
4from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 4from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
5 5
6class GalculatorTest(OESDKTestCase): 6class GalculatorTest(OESDKTestCase):
7 td_vars = ['TEST_LOG_DIR', 'DATETIME'] 7 td_vars = ['DATETIME']
8 8
9 @classmethod 9 @classmethod
10 def setUpClass(self): 10 def setUpClass(self):
@@ -19,7 +19,7 @@ class GalculatorTest(OESDKTestCase):
19 project = SDKBuildProject(self.tc.sdk_dir + "/galculator/", 19 project = SDKBuildProject(self.tc.sdk_dir + "/galculator/",
20 self.tc.sdk_env, 20 self.tc.sdk_env,
21 "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2", 21 "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2",
22 self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir) 22 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
23 23
24 project.download_archive() 24 project.download_archive()
25 25
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
2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject 2from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject
3 3
4class BuildIptablesTest(OESDKTestCase): 4class BuildIptablesTest(OESDKTestCase):
5 td_vars = ['TEST_LOG_DIR', 'DATETIME'] 5 td_vars = ['DATETIME']
6 6
7 @classmethod 7 @classmethod
8 def setUpClass(self): 8 def setUpClass(self):
@@ -10,7 +10,7 @@ class BuildIptablesTest(OESDKTestCase):
10 10
11 self.project = SDKBuildProject(self.tc.sdk_dir + "/iptables/", self.tc.sdk_env, 11 self.project = SDKBuildProject(self.tc.sdk_dir + "/iptables/", self.tc.sdk_env,
12 "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2", 12 "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2",
13 self.td['TEST_LOG_DIR'], self.td['DATETIME'], dl_dir=dl_dir) 13 self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir)
14 self.project.download_archive() 14 self.project.download_archive()
15 15
16 def test_iptables(self): 16 def test_iptables(self):