From patchwork Fri Dec 15 10:16:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 849081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="l6bkjUdV"; dkim-atps=neutral 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 3yymhh2YGXz9s4q for ; Fri, 15 Dec 2017 21:22:44 +1100 (AEDT) Received: from localhost ([::1]:45496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn8c-0004yn-DA for incoming@patchwork.ozlabs.org; Fri, 15 Dec 2017 05:22:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn34-0000n1-JI for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn33-0007Ay-Kk for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:16:58 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:51277) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00076y-5Y; Fri, 15 Dec 2017 05:16:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYy4v3Tz9t2M; 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=1513333014; bh=4RZcqjI5O+xn1CdZ9Q/+1vfHrTgUE73/+fhwtAT+Rwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l6bkjUdVlPKGIoxmd2ygP0m/63njNwF6BTXlDqS9N8TC1H5IZSRaoElCLH63INeLl LOF+apR8xGAPP5u4SOj7jj+PZ9C4jBoUWC75veP1ZxKh1YZH0fmxBtV2L6R+Bgz6MW Hg7M6S/M4H104r1qbe+GmEAhHoN1ZHB+WgqYy6YE= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:50 +1100 Message-Id: <20171215101651.13911-4-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: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 3/4] tests/pxe-test: Test net booting over IPv6 in some cases 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This adds IPv6 net boot testing (in addition to IPv4) when in slow test mode on ppc64 or s390. IPv6 PXE doesn't seem to work on x86, I'm guessing out BIOS image doesn't support it. Signed-off-by: David Gibson --- tests/pxe-test.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index f9bca8976d..e7a0610070 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -89,7 +89,14 @@ static void test_pxe_ipv4(gconstpointer data) test_pxe_one(test, false); } -static void test_batch(const testdef_t *tests) +static void test_pxe_ipv6(gconstpointer data) +{ + const testdef_t *test = data; + + test_pxe_one(test, true); +} + +static void test_batch(const testdef_t *tests, bool ipv6) { int i; @@ -101,6 +108,13 @@ static void test_batch(const testdef_t *tests) test->machine, test->model); qtest_add_data_func(testname, test, test_pxe_ipv4); g_free(testname); + + if (ipv6) { + testname = g_strdup_printf("pxe/ipv6/%s/%s", + test->machine, test->model); + qtest_add_data_func(testname, test, test_pxe_ipv6); + g_free(testname); + } } } @@ -116,17 +130,17 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { - test_batch(x86_tests); + test_batch(x86_tests, false); if (g_test_slow()) { - test_batch(x86_tests_slow); + test_batch(x86_tests_slow, false); } } else if (strcmp(arch, "ppc64") == 0) { - test_batch(ppc64_tests); + test_batch(ppc64_tests, g_test_slow()); if (g_test_slow()) { - test_batch(ppc64_tests_slow); + test_batch(ppc64_tests_slow, true); } } else if (g_str_equal(arch, "s390x")) { - test_batch(s390x_tests); + test_batch(s390x_tests, g_test_slow()); } ret = g_test_run(); boot_sector_cleanup(disk);