diff options
| -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): from oeqa.oetest import ImageTestContext from oeqa.targetcontrol import get_target_controller from oeqa.utils.dump import get_host_dumper + from bb.utils import export_proxies pn = d.getVar("PN") bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR")) test_create_extract_dirs(d) + # runtime use network for download projects for build + export_proxies(d) + # we need the host dumper in test context host_dumper = get_host_dumper(d) 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 @@ from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * -from oeqa.utils.targetbuild import TargetBuildProject +from oeqa.runtime.utils.targetbuildproject import TargetBuildProject def setUpModule(): if not oeRuntimeTest.hasFeature("tools-sdk"): @@ -10,9 +10,10 @@ class BuildCvsTest(oeRuntimeTest): @classmethod def setUpClass(self): - self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, - "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2") - self.project.download_archive() + dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) + self.project = TargetBuildProject(oeRuntimeTest.tc.target, + "http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2", + dl_dir=dl_dir) @testcase(205) @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 @@ from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * -from oeqa.utils.targetbuild import TargetBuildProject +from oeqa.runtime.utils.targetbuildproject import TargetBuildProject def setUpModule(): if not oeRuntimeTest.hasFeature("tools-sdk"): @@ -10,9 +10,11 @@ class GalculatorTest(oeRuntimeTest): @testcase(1526) @skipUnlessPassed("test_ssh") def test_galculator(self): + dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) try: - project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, - "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2") + project = TargetBuildProject(oeRuntimeTest.tc.target, + "http://galculator.mnim.org/downloads/galculator-2.1.4.tar.bz2", + dl_dir=dl_dir) project.download_archive() 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 @@ from oeqa.oetest import oeRuntimeTest, skipModule from oeqa.utils.decorators import * -from oeqa.utils.targetbuild import TargetBuildProject +from oeqa.runtime.utils.targetbuildproject import TargetBuildProject def setUpModule(): if not oeRuntimeTest.hasFeature("tools-sdk"): @@ -10,8 +10,10 @@ class BuildIptablesTest(oeRuntimeTest): @classmethod def setUpClass(self): - self.project = TargetBuildProject(oeRuntimeTest.tc.target, oeRuntimeTest.tc.d, - "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2") + dl_dir = oeRuntimeTest.tc.d.getVar('DL_DIR', True) + self.project = TargetBuildProject(oeRuntimeTest.tc.target, + "http://downloads.yoctoproject.org/mirror/sources/iptables-1.4.13.tar.bz2", + dl_dir=dl_dir) self.project.download_archive() @testcase(206) |