diff options
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 59cae2eff1..2d58f17ddb 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -14,6 +14,7 @@ import logging | |||
14 | from oeqa.utils.sshcontrol import SSHControl | 14 | from oeqa.utils.sshcontrol import SSHControl |
15 | from oeqa.utils.qemurunner import QemuRunner | 15 | from oeqa.utils.qemurunner import QemuRunner |
16 | from oeqa.utils.qemutinyrunner import QemuTinyRunner | 16 | from oeqa.utils.qemutinyrunner import QemuTinyRunner |
17 | from oeqa.utils.dump import TargetDumper | ||
17 | from oeqa.controllers.testtargetloader import TestTargetLoader | 18 | from oeqa.controllers.testtargetloader import TestTargetLoader |
18 | from abc import ABCMeta, abstractmethod | 19 | from abc import ABCMeta, abstractmethod |
19 | 20 | ||
@@ -123,9 +124,6 @@ class QemuTarget(BaseTarget): | |||
123 | self.origrootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) | 124 | self.origrootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + '.' + self.image_fstype) |
124 | self.rootfs = os.path.join(self.testdir, d.getVar("IMAGE_LINK_NAME", True) + '-testimage.' + self.image_fstype) | 125 | self.rootfs = os.path.join(self.testdir, d.getVar("IMAGE_LINK_NAME", True) + '-testimage.' + self.image_fstype) |
125 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') | 126 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') |
126 | self.dump_target = d.getVar("testimage_dump_target", True) | ||
127 | self.dump_host = d.getVar("testimage_dump_host", True) | ||
128 | self.dump_dir = d.getVar("TESTIMAGE_DUMP_DIR", True) | ||
129 | 127 | ||
130 | # Log QemuRunner log output to a file | 128 | # Log QemuRunner log output to a file |
131 | import oe.path | 129 | import oe.path |
@@ -155,6 +153,8 @@ class QemuTarget(BaseTarget): | |||
155 | logfile = self.qemulog, | 153 | logfile = self.qemulog, |
156 | boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True))) | 154 | boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True))) |
157 | 155 | ||
156 | self.target_dumper = TargetDumper(d, self.runner) | ||
157 | |||
158 | def deploy(self): | 158 | def deploy(self): |
159 | try: | 159 | try: |
160 | bb.utils.mkdirhier(self.testdir) | 160 | bb.utils.mkdirhier(self.testdir) |