summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 2d58f17ddb..542e259112 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -124,6 +124,9 @@ class QemuTarget(BaseTarget):
124 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)
125 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)
126 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')
127 dump_target_cmds = d.getVar("testimage_dump_target", True)
128 dump_host_cmds = d.getVar("testimage_dump_host", True)
129 dump_dir = d.getVar("TESTIMAGE_DUMP_DIR", True)
127 130
128 # Log QemuRunner log output to a file 131 # Log QemuRunner log output to a file
129 import oe.path 132 import oe.path
@@ -151,9 +154,11 @@ class QemuTarget(BaseTarget):
151 deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE", True), 154 deploy_dir_image = d.getVar("DEPLOY_DIR_IMAGE", True),
152 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True), 155 display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True),
153 logfile = self.qemulog, 156 logfile = self.qemulog,
154 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True))) 157 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True)),
158 dump_dir = dump_dir,
159 dump_host_cmds = d.getVar("testimage_dump_host", True))
155 160
156 self.target_dumper = TargetDumper(d, self.runner) 161 self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner)
157 162
158 def deploy(self): 163 def deploy(self):
159 try: 164 try: