[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/15] qemu_iotests: extent QMP socket timeout when using valg
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v3 10/15] qemu_iotests: extent QMP socket timeout when using valgrind |
Date: |
Wed, 14 Apr 2021 19:03:47 +0200 |
As with gdbserver, valgrind delays the test execution, so
the default QMP socket timeout timeout too soon.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
python/qemu/machine.py | 2 +-
tests/qemu-iotests/iotests.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index d6142271c2..dce96e1858 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -410,7 +410,7 @@ def _launch(self) -> None:
shell=False,
close_fds=False)
- if 'gdbserver' in self._wrapper:
+ if 'gdbserver' in self._wrapper or 'valgrind' in self._wrapper:
self._qmp_timer = None
self._post_launch()
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index a2e8604674..94597433fa 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -489,7 +489,7 @@ def log(msg: Msg,
class Timeout:
def __init__(self, seconds, errmsg="Timeout"):
- if qemu_gdb:
+ if qemu_gdb or qemu_valgrind:
self.seconds = 3000
else:
self.seconds = seconds
@@ -700,7 +700,7 @@ def qmp_to_opts(self, obj):
return ','.join(output_list)
def get_qmp_events(self, wait: bool = False) -> List[QMPMessage]:
- if qemu_gdb:
+ if qemu_gdb or qemu_valgrind:
wait = 0.0
return super().get_qmp_events(wait=wait)
--
2.30.2
- Re: [PATCH v3 04/15] qemu-iotests: add option to attach gdbserver, (continued)
- [PATCH v3 05/15] qemu-iotests: delay QMP socket timers, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 06/15] qemu_iotests: insert gdbserver command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 07/15] qemu-iotests: add gdbserver option to script tests too, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 08/15] docs/devel/testing: add -gdb option to the debugging section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 10/15] qemu_iotests: extent QMP socket timeout when using valgrind,
Emanuele Giuseppe Esposito <=
- [PATCH v3 09/15] qemu_iotests: extend the check script to support valgrind for python tests, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 13/15] docs/devel/testing: add -valgrind option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 12/15] qemu_iotests: insert valgrind command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/04/14
- [PATCH v3 15/15] docs/devel/testing: add -p option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/04/14