From patchwork Fri Dec 15 10:16:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 10114631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E9EC6019C for ; Fri, 15 Dec 2017 10:18:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3060C29F2C for ; Fri, 15 Dec 2017 10:18:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 257DC29F33; Fri, 15 Dec 2017 10:18:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C10CA29F2C for ; Fri, 15 Dec 2017 10:18:43 +0000 (UTC) Received: from localhost ([::1]:45473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn4l-0002Lj-14 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Dec 2017 05:18:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn37-0000pO-VQ for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn34-0007Bg-17 for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:01 -0500 Received: from ozlabs.org ([103.22.144.67]:54295) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00077z-LM; Fri, 15 Dec 2017 05:16:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYz0dKRz9t3t; Fri, 15 Dec 2017 21:16:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1513333015; bh=JxYCfDXEf/lDG0G0a03nkdqPXw1WGm2+HwFO2QfwVgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LhrYfVCFKSgSa0kCsDoAtQtttK7Xffji0Rr8BIbl7xOGnIZnmhuvKW+9tpD2ireZi apTNzMwShPKvax/VB72C6HaQirMp/kk266m65MxFDZ12hWmzD47ryQlpBexFAgtV6K cB28TXZXomvqOlEyGI6ojhnB/Yz03ng5zXpevOgA= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:48 +1100 Message-Id: <20171215101651.13911-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215101651.13911-1-david@gibson.dropbear.id.au> References: <20171215101651.13911-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 1/4] tests/pxe-test: Remove unnecessary special case test functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP All of the x86 and some of the other test cases here use a common test function, test_pxe_ipv4(), but one ppc and one s390 test use different functions. In the s390 case, this is completely pointless, the right parameter to test_pxe_ipv4() will already do exactly the right thing. For the spapr-vlan case there's a slight difference - it will use IPv6 instead of IPv4. But testing just one case with IPv6 (and NOT IPv4) is rather haphazard. Change everything to use the common test function, until we have a better way of testing IPv6 across the board. Signed-off-by: David Gibson Reviewed-by: Thomas Huth --- tests/pxe-test.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 937f29e631..eb70aa2bc6 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -47,16 +47,6 @@ static void test_pxe_ipv4(gconstpointer data) g_free(dev_arg); } -static void test_pxe_spapr_vlan(void) -{ - test_pxe_one("-device spapr-vlan,netdev=" NETNAME, true); -} - -static void test_pxe_virtio_ccw(void) -{ - test_pxe_one("-device virtio-net-ccw,bootindex=1,netdev=" NETNAME, false); -} - int main(int argc, char *argv[]) { int ret; @@ -79,13 +69,14 @@ int main(int argc, char *argv[]) qtest_add_data_func("pxe/vmxnet3", "vmxnet3", test_pxe_ipv4); } } else if (strcmp(arch, "ppc64") == 0) { - qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan); + qtest_add_data_func("pxe/spapr-vlan", "spapr-vlan", test_pxe_ipv4); if (g_test_slow()) { qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_ipv4); qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); } } else if (g_str_equal(arch, "s390x")) { - qtest_add_func("pxe/virtio-ccw", test_pxe_virtio_ccw); + qtest_add_data_func("pxe/virtio-ccw", + "virtio-net-ccw,bootindex=1", test_pxe_ipv4); } ret = g_test_run(); boot_sector_cleanup(disk);