david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libqtest: add QTEST_LOG for debugging qtest testcases

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-08-04 17:11:03 -04:00 committed by Stefan Hajnoczi
parent 9e52c53b8c
commit 7c282cb4c5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/libqtest.c
View File

@ -167,11 +167,12 @@ QTestState *qtest_init(const char *extra_args)
if (s->qemu_pid == 0) { if (s->qemu_pid == 0) {
command = g_strdup_printf("exec %s " command = g_strdup_printf("exec %s "
"-qtest unix:%s,nowait " "-qtest unix:%s,nowait "
"-qtest-log /dev/null " "-qtest-log %s "
"-qmp unix:%s,nowait " "-qmp unix:%s,nowait "
"-machine accel=qtest " "-machine accel=qtest "
"-display none " "-display none "
"%s", qemu_binary, socket_path, "%s", qemu_binary, socket_path,
getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",
qmp_socket_path, qmp_socket_path,
extra_args ?: ""); extra_args ?: "");
execlp("/bin/sh", "sh", "-c", command, NULL); 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) QDict *qtest_qmp_receive(QTestState *s)
{ {
QMPResponseParser qmp; QMPResponseParser qmp;
bool log = getenv("QTEST_LOG") != NULL;
qmp.response = NULL; qmp.response = NULL;
json_message_parser_init(&qmp.parser, qmp_response); json_message_parser_init(&qmp.parser, qmp_response);
@ -375,6 +377,9 @@ QDict *qtest_qmp_receive(QTestState *s)
exit(1); exit(1);
} }
if (log) {
len = write(2, &c, 1);
}
json_message_parser_feed(&qmp.parser, &c, 1); json_message_parser_feed(&qmp.parser, &c, 1);
} }
json_message_parser_destroy(&qmp.parser); json_message_parser_destroy(&qmp.parser);