diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/testimage.bbclass | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/buildcvs.py | 9 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/buildgalculator.py | 8 | ||||
-rw-r--r-- | meta/lib/oeqa/runtime/buildiptables.py | 8 |
4 files changed, 19 insertions, 10 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 7eb4038d21..6fed408613 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -129,11 +129,15 @@ def testimage_main(d): | |||
129 | from oeqa.oetest import ImageTestContext | 129 | from oeqa.oetest import ImageTestContext |
130 | from oeqa.targetcontrol import get_target_controller | 130 | from oeqa.targetcontrol import get_target_controller |
131 | from oeqa.utils.dump import get_host_dumper | 131 | from oeqa.utils.dump import get_host_dumper |
132 | from bb.utils import export_proxies | ||
132 | 133 | ||
133 | pn = d.getVar("PN") | 134 | pn = d.getVar("PN") |
134 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) | 135 | bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) |
135 | test_create_extract_dirs(d) | 136 | test_create_extract_dirs(d) |
136 | 137 | ||
138 | # runtime use network for download projects for build | ||
139 | export_proxies(d) | ||
140 | |||
137 | # we need the host dumper in test context | 141 | # we need the host dumper in test context |
138 | host_dumper = get_host_dumper(d) | 142 | host_dumper = get_host_dumper(d) |
139 | 143 | ||
diff --git a/meta/lib/oeqa/runtime/buildcvs.py b/meta/lib/oeqa/runtime/buildcvs.py index fe6cbfbcd5..a5ca3a5b37 100644 --- a/meta/lib/oeqa/runtime/buildcvs.py +++ b/meta/lib/oeqa/runtime/buildcvs.py | |||
@@ -1,6 +1,6 @@ | |||
1 | from oeqa.oetest import oeRuntimeTest, skipModule | 1 | from oeqa.oetest import oeRuntimeTest, skipModule |
2 | from oeqa.utils.decorators import * | 2 | from oeqa.utils.decorators import * |
3 | from oeqa.utils.targetbuild import TargetBuildProject | 3 | from oeqa.runtime.utils.targetbuildproject import TargetBuildProject |
4 | 4 | ||
5 | def setUpModule(): | 5 | def setUpModule(): |
6 | if not oeRuntimeTest.hasFeature("tools-sdk"): | 6 | if not oeRuntimeTest.hasFeature("tools-sdk"): |
@@ -10,9 +10,10 @@ class BuildCvsTest(oeRuntimeTest): | |||
10 | 10 | ||
11 | @classmethod | 11 | @classmethod |
12 | def setUpClass(self): | 12 | def setUpClass(self): |
13 | self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, | 13 | dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) |
14 | "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2") | 14 | self.project = TargetBuildProject(oeRuntimeTest.tc.target, |
15 | self.project.download_archive() | 15 | "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2", |
16 | dl_dir=dl_dir) | ||
16 | 17 | ||
17 | @testcase(205) | 18 | @testcase(205) |
18 | @skipUnlessPassed("test_ssh") | 19 | @skipUnlessPassed("test_ssh") |
diff --git a/meta/lib/oeqa/runtime/buildgalculator.py b/meta/lib/oeqa/runtime/buildgalculator.py index 220101d55c..20f0a79367 100644 --- a/meta/lib/oeqa/runtime/buildgalculator.py +++ b/meta/lib/oeqa/runtime/buildgalculator.py | |||
@@ -1,6 +1,6 @@ | |||
1 | from oeqa.oetest import oeRuntimeTest, skipModule | 1 | from oeqa.oetest import oeRuntimeTest, skipModule |
2 | from oeqa.utils.decorators import * | 2 | from oeqa.utils.decorators import * |
3 | from oeqa.utils.targetbuild import TargetBuildProject | 3 | from oeqa.runtime.utils.targetbuildproject import TargetBuildProject |
4 | 4 | ||
5 | def setUpModule(): | 5 | def setUpModule(): |
6 | if not oeRuntimeTest.hasFeature("tools-sdk"): | 6 | if not oeRuntimeTest.hasFeature("tools-sdk"): |
@@ -10,9 +10,11 @@ class GalculatorTest(oeRuntimeTest): | |||
10 | @testcase(1526) | 10 | @testcase(1526) |
11 | @skipUnlessPassed("test_ssh") | 11 | @skipUnlessPassed("test_ssh") |
12 | def test_galculator(self): | 12 | def test_galculator(self): |
13 | dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) | ||
13 | try: | 14 | try: |
14 | project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, | 15 | project = TargetBuildProject(oeRuntimeTest.tc.target, |
15 | "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2") | 16 | "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2", |
17 | dl_dir=dl_dir) | ||
16 | project.download_archive() | 18 | project.download_archive() |
17 | 19 | ||
18 | self.assertEqual(project.run_configure(), 0, | 20 | self.assertEqual(project.run_configure(), 0, |
diff --git a/meta/lib/oeqa/runtime/buildiptables.py b/meta/lib/oeqa/runtime/buildiptables.py index bc75d0a0c7..a0e82f0dde 100644 --- a/meta/lib/oeqa/runtime/buildiptables.py +++ b/meta/lib/oeqa/runtime/buildiptables.py | |||
@@ -1,6 +1,6 @@ | |||
1 | from oeqa.oetest import oeRuntimeTest, skipModule | 1 | from oeqa.oetest import oeRuntimeTest, skipModule |
2 | from oeqa.utils.decorators import * | 2 | from oeqa.utils.decorators import * |
3 | from oeqa.utils.targetbuild import TargetBuildProject | 3 | from oeqa.runtime.utils.targetbuildproject import TargetBuildProject |
4 | 4 | ||
5 | def setUpModule(): | 5 | def setUpModule(): |
6 | if not oeRuntimeTest.hasFeature("tools-sdk"): | 6 | if not oeRuntimeTest.hasFeature("tools-sdk"): |
@@ -10,8 +10,10 @@ class BuildIptablesTest(oeRuntimeTest): | |||
10 | 10 | ||
11 | @classmethod | 11 | @classmethod |
12 | def setUpClass(self): | 12 | def setUpClass(self): |
13 | self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, | 13 | dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) |
14 | "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2") | 14 | self.project = TargetBuildProject(oeRuntimeTest.tc.target, |
15 | "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2", | ||
16 | dl_dir=dl_dir) | ||
15 | self.project.download_archive() | 17 | self.project.download_archive() |
16 | 18 | ||
17 | @testcase(206) | 19 | @testcase(206) |