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/utils/commands.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/utils/commands.py')
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index 73ede2379f..82c5908e9c 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py | |||
@@ -218,7 +218,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec= | |||
218 | 218 | ||
219 | 219 | ||
220 | @contextlib.contextmanager | 220 | @contextlib.contextmanager |
221 | def runqemu(pn, ssh=True, runqemuparams=''): | 221 | def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None): |
222 | 222 | ||
223 | import bb.tinfoil | 223 | import bb.tinfoil |
224 | import bb.build | 224 | import bb.build |
@@ -240,7 +240,7 @@ def runqemu(pn, ssh=True, runqemuparams=''): | |||
240 | logger.propagate = False | 240 | logger.propagate = False |
241 | logdir = recipedata.getVar("TEST_LOG_DIR") | 241 | logdir = recipedata.getVar("TEST_LOG_DIR") |
242 | 242 | ||
243 | qemu = oeqa.targetcontrol.QemuTarget(recipedata) | 243 | qemu = oeqa.targetcontrol.QemuTarget(recipedata, image_fstype) |
244 | finally: | 244 | finally: |
245 | # We need to shut down tinfoil early here in case we actually want | 245 | # We need to shut down tinfoil early here in case we actually want |
246 | # to run tinfoil-using utilities with the running QEMU instance. | 246 | # to run tinfoil-using utilities with the running QEMU instance. |