[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 5/6] iotests: extended timeout under Valgrind
From: |
Andrey Shinkevich |
Subject: |
[Qemu-devel] [PATCH v5 5/6] iotests: extended timeout under Valgrind |
Date: |
Fri, 19 Jul 2019 19:30:15 +0300 |
As the iotests run longer under the Valgrind, the QEMU_COMM_TIMEOUT is
to be increased in the test cases 028, 183 and 192 when running under
the Valgrind.
Suggested-by: Roman Kagan <address@hidden>
Signed-off-by: Andrey Shinkevich <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
tests/qemu-iotests/028 | 6 +++++-
tests/qemu-iotests/183 | 9 ++++++++-
tests/qemu-iotests/192 | 6 +++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 01f4959..71301ec 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -110,7 +110,11 @@ echo
qemu_comm_method="monitor"
_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk
h=$QEMU_HANDLE
-QEMU_COMM_TIMEOUT=1
+if [ "${VALGRIND_QEMU}" == "y" ]; then
+ QEMU_COMM_TIMEOUT=7
+else
+ QEMU_COMM_TIMEOUT=1
+fi
# Silence output since it contains the disk image path and QEMU's readline
# character echoing makes it very hard to filter the output. Plus, there
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index fbe5a99..04fb344 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -94,8 +94,15 @@ if echo "$reply" | grep "compiled without old-style" >
/dev/null; then
_notrun "migrate -b support not compiled in"
fi
-QEMU_COMM_TIMEOUT=0.1 qemu_cmd_repeat=50 silent=yes \
+timeout_comm=$QEMU_COMM_TIMEOUT
+if [ "${VALGRIND_QEMU}" == "y" ]; then
+ QEMU_COMM_TIMEOUT=4
+else
+ QEMU_COMM_TIMEOUT=0.1
+fi
+qemu_cmd_repeat=50 silent=yes \
_send_qemu_cmd $src "{ 'execute': 'query-migrate' }" '"status":
"completed"'
+QEMU_COMM_TIMEOUT=$timeout_comm
_send_qemu_cmd $src "{ 'execute': 'query-status' }" "return"
echo
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 6193257..0344322 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -60,7 +60,11 @@ fi
qemu_comm_method="monitor"
_launch_qemu -drive $DRIVE_ARG -incoming defer
h=$QEMU_HANDLE
-QEMU_COMM_TIMEOUT=1
+if [ "${VALGRIND_QEMU}" == "y" ]; then
+ QEMU_COMM_TIMEOUT=7
+else
+ QEMU_COMM_TIMEOUT=1
+fi
_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)"
_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"
--
1.8.3.1
- [Qemu-devel] [PATCH v5 0/6] Allow Valgrind checking all QEMU processes, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 2/6] iotests: exclude killed processes from running under Valgrind, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 1/6] iotests: allow Valgrind checking all QEMU processes, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 4/6] iotests: Valgrind fails with nonexistent directory, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 6/6] iotests: extend sleeping time under Valgrind, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 3/6] iotests: Add casenotrun report to bash tests, Andrey Shinkevich, 2019/07/19
- [Qemu-devel] [PATCH v5 5/6] iotests: extended timeout under Valgrind,
Andrey Shinkevich <=