[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/55] libqtest: add QTEST_LOG for debugging qtest te
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 02/55] libqtest: add QTEST_LOG for debugging qtest testcases |
Date: |
Fri, 15 Aug 2014 18:06:09 +0100 |
From: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/libqtest.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 98e8f4b..4a75cd3 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);
@@ -358,6 +359,7 @@ static void qmp_response(JSONMessageParser *parser, QList
*tokens)
QDict *qtest_qmp_receive(QTestState *s)
{
QMPResponseParser qmp;
+ bool log = getenv("QTEST_LOG") != NULL;
qmp.response = NULL;
json_message_parser_init(&qmp.parser, qmp_response);
@@ -375,6 +377,9 @@ QDict *qtest_qmp_receive(QTestState *s)
exit(1);
}
+ if (log) {
+ len = write(2, &c, 1);
+ }
json_message_parser_feed(&qmp.parser, &c, 1);
}
json_message_parser_destroy(&qmp.parser);
--
1.9.3
- [Qemu-devel] [PULL 00/55] Block patches, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 01/55] blkdebug: report errors on flush too, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 02/55] libqtest: add QTEST_LOG for debugging qtest testcases,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 03/55] ide-test: add test for werror=stop, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 04/55] ide: stash aiocb for flushes, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 05/55] ide: simplify reset callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 06/55] ide: simplify set_inactive callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 08/55] ide: simplify start_transfer callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 07/55] ide: simplify async_cmd_done callbacks, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 09/55] ide: wrap start_dma callback, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 11/55] ide: fold add_status callback into set_inactive, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 10/55] ide: remove wrong setting of BM_STATUS_INT, Stefan Hajnoczi, 2014/08/15
- [Qemu-devel] [PULL 12/55] ide: move BM_STATUS bits to pci.[ch], Stefan Hajnoczi, 2014/08/15