From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XANns-0005GN-80 for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:31:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XANng-0008IX-Je for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:31:44 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:42902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XANng-0008IR-Cs for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:31:32 -0400 Received: by mail-wi0-f173.google.com with SMTP id f8so10203690wiw.6 for ; Thu, 24 Jul 2014 11:31:31 -0700 (PDT) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Thu, 24 Jul 2014 20:31:01 +0200 Message-Id: <1406226665-1710-4-git-send-email-marc.mari.barcelo@gmail.com> In-Reply-To: <1406226665-1710-1-git-send-email-marc.mari.barcelo@gmail.com> References: <1406226665-1710-1-git-send-email-marc.mari.barcelo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 3/7] libqtest: add QTEST_LOG for debugging qtest testcases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Paolo Bonzini , Stefan Hajnoczi Signed-off-by: Paolo Bonzini Signed-off-by: Marc Marí --- tests/libqtest.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 98e8f4b..056275d 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -167,11 +167,12 @@ QTestState *qtest_init(const char *extra_args) if (s->qemu_pid == 0) { command = g_strdup_printf("exec %s " "-qtest unix:%s,nowait " - "-qtest-log /dev/null " + "-qtest-log %s " "-qmp unix:%s,nowait " "-machine accel=qtest " "-display none " "%s", qemu_binary, socket_path, + getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", qmp_socket_path, extra_args ?: ""); execlp("/bin/sh", "sh", "-c", command, NULL); @@ -397,10 +398,18 @@ QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap) /* No need to send anything for an empty QObject. */ if (qobj) { + size_t len; + int log = getenv("QTEST_LOG") != NULL; QString *qstr = qobject_to_json(qobj); const char *str = qstring_get_str(qstr); size_t size = qstring_get_length(qstr); + if (log) { + len = write(2, str, size); + if (len != size) { + fprintf(stderr, "Could not log\n"); + } + } /* Send QMP request */ socket_send(s->qmp_fd, str, size); -- 1.7.10.4