qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Emanuele Giuseppe Esposito <eesposit@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Cleber Rosa <crosa@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [RFC PATCH v2 07/11] qemu_iotests: extend the check script to support valgrind for python tests
Date: Wed,  7 Apr 2021 15:50:17 +0200	[thread overview]
Message-ID: <20210407135021.48330-8-eesposit@redhat.com> (raw)
In-Reply-To: <20210407135021.48330-1-eesposit@redhat.com>

Currently, the check script only parses the option and sets the
VALGRIND_QEMU environmental variable to "y".
Add another iotests python variable that prepares the command line,
identical to the one provided in the test scripts.

Because the python script does not know in advance the valgrind
PID to assign to the log file name, use the "%p" flag in valgrind
log file name that automatically puts the process PID at runtime.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
 tests/qemu-iotests/iotests.py | 11 +++++++++++
 tests/qemu-iotests/testenv.py |  1 +
 2 files changed, 12 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 8f6bb20af5..7c28f0cb74 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -96,6 +96,17 @@
     sys.stderr.write('Please run this test via the "check" script\n')
     sys.exit(os.EX_USAGE)
 
+qemu_valgrind = []
+if os.environ.get('VALGRIND_QEMU') == "y" and \
+    os.environ.get('NO_VALGRIND') != "y":
+    valgrind_logfile = "--log-file=" + test_dir.strip()
+    # %p allows to put the valgrind process PID, since
+    # we don't know it a priori (subprocess.Peopen is
+    # not yet invoked)
+    valgrind_logfile += "/%p.valgrind"
+
+    qemu_valgrind = ['valgrind', valgrind_logfile, '--error-exitcode=99']
+
 socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
 
 luks_default_secret_object = 'secret,id=keysec0,data=' + \
diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
index 669eb6b925..86798bf752 100644
--- a/tests/qemu-iotests/testenv.py
+++ b/tests/qemu-iotests/testenv.py
@@ -280,6 +280,7 @@ def print_env(self) -> None:
 SOCK_DIR      -- {SOCK_DIR}
 SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}
 GDB_QEMU      -- "{GDB_QEMU}"
+VALGRIND_QEMU     -- "{VALGRIND_QEMU}"
 """
 
         args = collections.defaultdict(str, self.get_env())
-- 
2.30.2



  parent reply	other threads:[~2021-04-07 14:08 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-07 13:50 [RFC PATCH v2 00/11] qemu_iotests: improve debugging options Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 01/11] python: qemu: add timer parameter for qmp.accept socket Emanuele Giuseppe Esposito
2021-04-08 19:51   ` John Snow
2021-04-09 16:01     ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 02/11] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine Emanuele Giuseppe Esposito
2021-04-08 19:59   ` John Snow
2021-04-09 16:07     ` Emanuele Giuseppe Esposito
2021-04-09 16:37       ` John Snow
2021-04-07 13:50 ` [RFC PATCH v2 03/11] qemu-iotests: add option to attach gdbserver Emanuele Giuseppe Esposito
2021-04-08 15:40   ` Paolo Bonzini
2021-04-08 16:02     ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 04/11] qemu-iotests: delay QMP socket timers Emanuele Giuseppe Esposito
2021-04-08 15:40   ` Paolo Bonzini
2021-04-08 16:06     ` Emanuele Giuseppe Esposito
2021-04-08 19:03       ` Paolo Bonzini
2021-04-09 16:13         ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 05/11] qemu_iotests: insert gdbserver command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 06/11] qemu-iotests: add gdbserver option to script tests too Emanuele Giuseppe Esposito
2021-04-07 13:50 ` Emanuele Giuseppe Esposito [this message]
2021-04-07 13:50 ` [RFC PATCH v2 08/11] qemu_iotests: extent QMP socket timeout when using valgrind Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 09/11] qemu_iotests: allow valgrint to print/delete the generated log file Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 10/11] qemu_iotests: insert valgrind command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 11/11] qemu_iotests: add option to show qemu binary logs on stdout Emanuele Giuseppe Esposito
2021-04-08  8:26 ` [RFC PATCH v2 00/11] qemu_iotests: improve debugging options Markus Armbruster
2021-04-08 11:15   ` Emanuele Giuseppe Esposito
2021-04-08 12:39     ` Markus Armbruster
2021-04-08 13:41       ` Emanuele Giuseppe Esposito

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210407135021.48330-8-eesposit@redhat.com \
    --to=eesposit@redhat.com \
    --cc=crosa@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).