From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS1qb-0007t6-Al for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS1qa-0005hY-Dq for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS1qa-0005h2-6W for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:20 -0500 Date: Thu, 21 Dec 2017 16:29:18 +0200 From: "Michael S. Tsirkin" Message-ID: <1513866427-27125-14-git-send-email-mst@redhat.com> References: <1513866427-27125-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1513866427-27125-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 13/25] tests/pxe-test: Test net booting over IPv6 in some cases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , David Gibson , Thomas Huth , Cornelia Huck , Paolo Bonzini From: David Gibson 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 our BIOS image doesn't support it. Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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 4758ce7..5689c7d 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -81,7 +81,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; @@ -93,6 +100,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); + } } } @@ -108,17 +122,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); -- MST