From: Paolo Bonzini Date: Wed, 6 Jun 2012 14:23:27 +0000 (+0200) Subject: qemu-iotests: start vms in qtest mode X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~3993^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0fd05e8dd1ee7ae143fba3d6bcc6abe3fbeaeb34;p=sdk%2Femulator%2Fqemu.git qemu-iotests: start vms in qtest mode This way, they will not execute any VM code at all. However, right now the cancellation test is "relying" on being slowed down by TCG executing BIOS code. So, change the timeouts. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 4ab7d62..cc671dd 100755 --- a/tests/qemu-iotests/030 +++ b/tests/qemu-iotests/030 @@ -147,7 +147,7 @@ class TestStreamStop(ImageStreamingTestCase): result = self.vm.qmp('block-stream', device='drive0') self.assert_qmp(result, 'return', {}) - time.sleep(1) + time.sleep(0.1) events = self.vm.get_qmp_events(wait=False) self.assertEqual(events, [], 'unexpected QMP event: %s' % events) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index e27b40e2..e05b1d6 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -54,7 +54,9 @@ class VM(object): self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d' % os.getpid()) self._args = qemu_args + ['-chardev', 'socket,id=mon,path=' + self._monitor_path, - '-mon', 'chardev=mon,mode=control', '-nographic'] + '-mon', 'chardev=mon,mode=control', + '-qtest', 'stdio', '-machine', 'accel=qtest', + '-display', 'none', '-vga', 'none'] self._num_drives = 0 def add_drive(self, path, opts=''):