summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2015-09-01 07:36:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-03 12:43:16 +0100
commit53ab41a5f6d20e911362a9261ae528452bb71bbd (patch)
tree0962c78c4f378c3de0fc25810778a49f0a35d168 /meta/lib/oeqa/targetcontrol.py
parent170b89d9863a1b8560f397d3bb7a1eafd7c61e1e (diff)
downloadpoky-53ab41a5f6d20e911362a9261ae528452bb71bbd.tar.gz
qemurunner: Added host dumps when there are errors
This adds an instance of HostDumper to qemurunner, with this instance now is possible to get dumps from the host when there is an error. This adds dump points in the next cases: - runqemu exits before seeing qemu pid - Fail to get qemu process arguments - Not reach login banner before timeout - qemu pid never appears This also modifies the constructors of BaseDumper, HostDumper and TargetDumper, they don't require the datastore anymore, but the feature to replace datastore variables has been lost (never used) [YOCTO #8118] (From OE-Core rev: b0af40fb76cd5035696e9d8a44f815f64214d23a) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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: