From patchwork Mon Jan 6 06:05:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kewei Yu X-Patchwork-Id: 307111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 176912C0133 for ; Mon, 6 Jan 2014 17:06:17 +1100 (EST) Received: from localhost ([::1]:60883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W03KI-0004dP-3a for incoming@patchwork.ozlabs.org; Mon, 06 Jan 2014 01:06:14 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=K1u3fdtOTmd08UG72yfxaI0RxV9FTb2fgNJDnSQm/Zk=; b=HEyAJKr6fcvlfwIEPxGZht9siBonUuje+LtV7JuPu9Mtcmndbwi4NSPl5ShFM+39iA gHtRfBrdnlQiNS6rpgt+QTCBbKR9Dqs7+u2IJqoGAD7uvQ6xLO2u6BdPiU8MCDqjcEpS JdKSJrdh+f7UQDvoUIWuWkFVccRKmRjinTLqmYHi4h7q0VnfxhnYvLVFuacXixVON039 /2NFZ4nyYBds6Xx70B4nwBikscnrJOqlS7YW7iNHctNk2A1Nf0A9aDyq2heNyYNF7gQn HX3Gblm7AUz6r+HAI/AccH5Hvo2CDKpVkOZSNObL4yIJIcPMprAx2bsHr7dh+WLd+zvF +Qyw== X-Received: by 10.68.194.97 with SMTP id hv1mr2932304pbc.162.1388988337527; Sun, 05 Jan 2014 22:05:37 -0800 (PST) Received: from localhost.localdomain ([221.122.32.18]) by mx.google.com with ESMTPSA id gf5sm125989145pbc.22.2014.01.05.22.05.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Jan 2014 22:05:36 -0800 (PST) From: Kewei Yu To: qemu-devel@nongnu.org, kwolf@redhat.com Date: Mon, 6 Jan 2014 14:05:24 +0800 Message-Id: <1388988324-25281-1-git-send-email-keweihk@gmail.com> X-Mailer: git-send-email 1.7.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22b Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 1/1] qtest: Fix the bug about disable vnc causes "make check" fail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Paolo Bonzini --- 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);