diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-03-06 17:10:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-08 11:52:56 +0000 |
commit | 27badf83ecbf4cd72c74ae21dbc1a6e21f9f1fa9 (patch) | |
tree | 61f84f372e8b9c8916fe99c552aa1ef136990eca /meta/lib/oeqa/targetcontrol.py | |
parent | 383cd20828e4a0f88f2d9659aafe5d0a162e8fbc (diff) | |
download | poky-27badf83ecbf4cd72c74ae21dbc1a6e21f9f1fa9.tar.gz |
targetcontrol: add image_fstype argument to commands.runqemu
qemu runner picks up first fsimage type from the hard-coded
list of supported types. This makes it impossible to test
particular image type unless it's not ext4(first type in
the hardcoded list of types).
Added image_fstypes argument to commands.runqemu and QemuTarget
__init__ to specify type of the image to run qemu with.
This will be used to pass wic image type to test efi wic images.
(From OE-Core rev: f1f224a2d4d3f2a760632c2254e91a8f94c8814f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@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.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index dbd2c7ca1e..0ad3a6bf14 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
@@ -113,11 +113,11 @@ class QemuTarget(BaseTarget): | |||
113 | 113 | ||
114 | supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] | 114 | supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic'] |
115 | 115 | ||
116 | def __init__(self, d): | 116 | def __init__(self, d, image_fstype=None): |
117 | 117 | ||
118 | super(QemuTarget, self).__init__(d) | 118 | super(QemuTarget, self).__init__(d) |
119 | 119 | ||
120 | self.image_fstype = self.get_image_fstype(d) | 120 | self.image_fstype = image_fstype or self.get_image_fstype(d) |
121 | self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) | 121 | self.qemulog = os.path.join(self.testdir, "qemu_boot_log.%s" % self.datetime) |
122 | self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("IMAGE_LINK_NAME") + '.' + self.image_fstype) | 122 | self.rootfs = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("IMAGE_LINK_NAME") + '.' + self.image_fstype) |
123 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') | 123 | self.kernel = os.path.join(d.getVar("DEPLOY_DIR_IMAGE"), d.getVar("KERNEL_IMAGETYPE", False) + '-' + d.getVar('MACHINE', False) + '.bin') |