[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v8 08/16] qemu-iotests: add gdbserver option to script tests

From: Max Reitz
Subject: Re: [PATCH v8 08/16] qemu-iotests: add gdbserver option to script tests too
Date: Thu, 15 Jul 2021 14:54:29 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0

On 05.07.21 08:57, Emanuele Giuseppe Esposito wrote:
Remove read timer in test script when GDB_OPTIONS are set,
so that the bash tests won't timeout while running gdb.

The only limitation here is that running a script with gdbserver
will make the test output mismatch with the expected
results, making the test fail.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
  tests/qemu-iotests/common.qemu | 7 ++++++-
  tests/qemu-iotests/common.rc   | 8 +++++++-
  2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
index 0fc52d20d7..cbca757b49 100644
--- a/tests/qemu-iotests/common.qemu
+++ b/tests/qemu-iotests/common.qemu
@@ -85,7 +85,12 @@ _timed_wait_for()
-    while IFS= read -t ${QEMU_COMM_TIMEOUT} resp <&${QEMU_OUT[$h]}
+    read_timeout="-t ${QEMU_COMM_TIMEOUT}"
+    if [ ! -z ${GDB_OPTIONS} ]; then

Shouldn’t we quote "${GDB_OPTIONS}" so that `test` won’t interpret it as its own parameters (if something in there starts with `--`, which I don’t think is the intended usage for $GDB_OPTIONS, but, well...)?

(Also, `! -z` is the same as `-n`, but I suppose choosing between the two can be a matter of style.)

+        read_timeout=
+    fi
+    while IFS= read ${read_timeout} resp <&${QEMU_OUT[$h]}
          if [ -n "$capture_events" ]; then
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cbbf6d7c7f..a1ef2b5c2f 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -166,8 +166,14 @@ _qemu_wrapper()
          if [ -n "${QEMU_NEED_PID}" ]; then
              echo $BASHPID > "${QEMU_TEST_DIR}/qemu-${_QEMU_HANDLE}.pid"
+        GDB=""
+        if [ ! -z ${GDB_OPTIONS} ]; then

Here, too.  (Sorry for not noticing in v3 already...)


+            GDB="gdbserver ${GDB_OPTIONS}"
+        fi
          VALGRIND_QEMU="${VALGRIND_QEMU_VM}" _qemu_proc_exec 
-            "$QEMU_PROG" $QEMU_OPTIONS "$@"
+            $GDB "$QEMU_PROG" $QEMU_OPTIONS "$@"
      _qemu_proc_valgrind_log "${VALGRIND_LOGFILE}" $RETVAL

reply via email to

[Prev in Thread] Current Thread [Next in Thread]