From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W03Jt-0004cM-RZ for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:05:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W03Jk-0001O2-Te for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:05:49 -0500 Received: from mail-pb0-x22b.google.com ([2607:f8b0:400e:c01::22b]:59914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W03Jk-0001Ns-1b for qemu-devel@nongnu.org; Mon, 06 Jan 2014 01:05:40 -0500 Received: by mail-pb0-f43.google.com with SMTP id rq2so18098289pbb.2 for ; Sun, 05 Jan 2014 22:05:37 -0800 (PST) From: Kewei Yu Date: Mon, 6 Jan 2014 14:05:24 +0800 Message-Id: <1388988324-25281-1-git-send-email-keweihk@gmail.com> Subject: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kwolf@redhat.com Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, afaerber@suse.de When we disable vnc from "./configure", QEMU can't use the vnc option. So qtest can't use the "vnc -none ", otherwise "make check" fails. If QEMU uses "-display none", "-vnc none" is excrescent, So we just need to drop it. Signed-off-by: Kewei Yu --- v2: Consolidate VNC macro's #ifdef'ery to one central point (tests/libqtest.c). v3: Fix the spelling and terminology error: "s/disabling/disable; s/the\ qemu/QEMU; s/hangs/fails;" v4: If QEMU uses "-display none", "-vnc none" is excrescent, So we just need to drop it. --- tests/fdc-test.c | 5 +---- tests/ide-test.c | 3 --- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 38b5b17..37096dc 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -518,7 +518,6 @@ static void fuzz_registers(void) int main(int argc, char **argv) { const char *arch = qtest_get_arch(); - char *cmdline; int fd; int ret; @@ -538,9 +537,7 @@ int main(int argc, char **argv) /* Run the tests */ g_test_init(&argc, &argv, NULL); - cmdline = g_strdup_printf("-vnc none "); - - qtest_start(cmdline); + qtest_start(NULL); qtest_irq_intercept_in(global_qtest, "ioapic"); qtest_add_func("/fdc/cmos", test_cmos); qtest_add_func("/fdc/no_media_on_start", test_no_media_on_start); diff --git a/tests/ide-test.c b/tests/ide-test.c index d5cec5a..4a0d97f 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -380,7 +380,6 @@ static void test_bmdma_no_busmaster(void) static void test_bmdma_setup(void) { ide_test_start( - "-vnc none " "-drive file=%s,if=ide,serial=%s,cache=writeback " "-global ide-hd.ver=%s", tmp_path, "testdisk", "version"); @@ -410,7 +409,6 @@ static void test_identify(void) int ret; ide_test_start( - "-vnc none " "-drive file=%s,if=ide,serial=%s,cache=writeback " "-global ide-hd.ver=%s", tmp_path, "testdisk", "version"); @@ -455,7 +453,6 @@ static void test_flush(void) uint8_t data; ide_test_start( - "-vnc none " "-drive file=blkdebug::%s,if=ide,cache=writeback", tmp_path); -- 1.7.1