For some tests we are about to add we want the flexibility to force "kvm" so give them that ability.
Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- v2 - fix the sh4 direct call to prepare run. --- tests/functional/qemu_test/tuxruntest.py | 9 +++++++-- tests/functional/sh4/test_tuxrun.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/functional/qemu_test/tuxruntest.py b/tests/functional/qemu_test/tuxruntest.py index 6c442ff0dc4..ca1589fea37 100644 --- a/tests/functional/qemu_test/tuxruntest.py +++ b/tests/functional/qemu_test/tuxruntest.py @@ -65,7 +65,7 @@ def fetch_tuxrun_assets(self, kernel_asset, rootfs_asset, dtb_asset=None): return (kernel_image, disk_image, dtb) - def prepare_run(self, kernel, disk, drive, dtb=None, console_index=0): + def prepare_run(self, accel, kernel, disk, drive, dtb=None, console_index=0): """ Setup to run and add the common parameters to the system """ @@ -79,6 +79,10 @@ def prepare_run(self, kernel, disk, drive, dtb=None, console_index=0): self.kcmd_line += f" root=/dev/{self.root}" self.kcmd_line += f" console={self.console}" + # have we specified an accelerator? + if accel: + self.vm.add_args('-accel', accel) + self.vm.add_args('-kernel', kernel, '-append', self.kcmd_line, '-blockdev', blockdev) @@ -118,6 +122,7 @@ def run_tuxtest_tests(self, haltmsg): def common_tuxrun(self, kernel_asset, rootfs_asset, + accel=None, dtb_asset=None, drive="virtio-blk-device", haltmsg="reboot: System halted", @@ -130,7 +135,7 @@ def common_tuxrun(self, (kernel, disk, dtb) = self.fetch_tuxrun_assets(kernel_asset, rootfs_asset, dtb_asset) - self.prepare_run(kernel, disk, drive, dtb, console_index) + self.prepare_run(accel, kernel, disk, drive, dtb, console_index) self.vm.launch() self.run_tuxtest_tests(haltmsg) os.remove(disk) diff --git a/tests/functional/sh4/test_tuxrun.py b/tests/functional/sh4/test_tuxrun.py index 1748f8c7eff..42b503585b2 100755 --- a/tests/functional/sh4/test_tuxrun.py +++ b/tests/functional/sh4/test_tuxrun.py @@ -35,7 +35,7 @@ def test_sh4(self): self.ASSET_SH4_ROOTFS) # the console comes on the second serial port - self.prepare_run(kernel, disk, + self.prepare_run(None, kernel, disk, "driver=ide-hd,bus=ide.0,unit=0", console_index=1) self.vm.launch() -- 2.47.3
