From nobody Tue Feb 10 04:03:05 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513868494214490.0189059425303; Thu, 21 Dec 2017 07:01:34 -0800 (PST) Received: from localhost ([::1]:53476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS2LQ-0000bq-2m for importer@patchew.org; Thu, 21 Dec 2017 10:01:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS1qd-0007vD-8T for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS1qZ-0005gX-6Y for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS1qY-0005fz-Uc for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D27E3683C; Thu, 21 Dec 2017 14:29:18 +0000 (UTC) Received: from redhat.com (ovpn-124-215.rdu2.redhat.com [10.10.124.215]) by smtp.corp.redhat.com (Postfix) with SMTP id C1A415DA67; Thu, 21 Dec 2017 14:29:16 +0000 (UTC) Date: Thu, 21 Dec 2017 16:29:16 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1513866427-27125-13-git-send-email-mst@redhat.com> References: <1513866427-27125-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1513866427-27125-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 21 Dec 2017 14:29:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/25] tests/pxe-test: Use table of testcases rather than open-coding 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: Peter Maydell , Thomas Huth , Cornelia Huck , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Gibson Currently pxe-tests open codes the list of tests for each architecture. This changes it to use tables of test parameters, somewhat similar to boot-serial-test. This adds the machine type into the table as well, giving us the ability to perform tests on multiple machine types for architectures where there's more than one machine type that matters. NOTE: This changes the names of the tests in the output, to include the machine type and IPv4 vs. IPv6. I'm not sure if this has the potential to break existing tooling. Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/pxe-test.c | 86 +++++++++++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index eb70aa2..4758ce7 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -22,14 +22,51 @@ =20 static char disk[] =3D "tests/pxe-test-disk-XXXXXX"; =20 -static void test_pxe_one(const char *params, bool ipv6) +typedef struct testdef { + const char *machine; /* Machine type */ + const char *model; /* NIC device model */ +} testdef_t; + +static testdef_t x86_tests[] =3D { + { "pc", "e1000" }, + { "pc", "virtio-net-pci" }, + { NULL }, +}; + +static testdef_t x86_tests_slow[] =3D { + { "pc", "ne2k_pci", }, + { "pc", "i82550", }, + { "pc", "rtl8139" }, + { "pc", "vmxnet3" }, + { NULL }, +}; + +static testdef_t ppc64_tests[] =3D { + { "pseries", "spapr-vlan" }, + { NULL }, +}; + +static testdef_t ppc64_tests_slow[] =3D { + { "pseries", "virtio-net-pci", }, + { "pseries", "e1000" }, + { NULL }, +}; + +static testdef_t s390x_tests[] =3D { + { "s390-ccw-virtio", "virtio-net-ccw" }, + { NULL }, +}; + +static void test_pxe_one(const testdef_t *test, bool ipv6) { char *args; =20 - args =3D g_strdup_printf("-machine accel=3Dkvm:tcg -nodefaults -boot o= rder=3Dn " - "-netdev user,id=3D" NETNAME ",tftp=3D./,bootfi= le=3D%s," - "ipv4=3D%s,ipv6=3D%s %s", disk, ipv6 ? "off" : = "on", - ipv6 ? "on" : "off", params); + args =3D g_strdup_printf( + "-machine %s,accel=3Dkvm:tcg -nodefaults -boot order=3Dn " + "-netdev user,id=3D" NETNAME ",tftp=3D./,bootfile=3D%s,ipv4=3D%s,i= pv6=3D%s " + "-device %s,bootindex=3D1,netdev=3D" NETNAME, + test->machine, disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off", + test->model); =20 qtest_start(args); boot_sector_test(); @@ -39,12 +76,24 @@ static void test_pxe_one(const char *params, bool ipv6) =20 static void test_pxe_ipv4(gconstpointer data) { - const char *model =3D data; - char *dev_arg; + const testdef_t *test =3D data; =20 - dev_arg =3D g_strdup_printf("-device %s,netdev=3D" NETNAME, model); - test_pxe_one(dev_arg, false); - g_free(dev_arg); + test_pxe_one(test, false); +} + +static void test_batch(const testdef_t *tests) +{ + int i; + + for (i =3D 0; tests[i].machine; i++) { + const testdef_t *test =3D &tests[i]; + char *testname; + + testname =3D g_strdup_printf("pxe/ipv4/%s/%s", + test->machine, test->model); + qtest_add_data_func(testname, test, test_pxe_ipv4); + g_free(testname); + } } =20 int main(int argc, char *argv[]) @@ -59,24 +108,17 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); =20 if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); - qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_ipv4); + test_batch(x86_tests); if (g_test_slow()) { - qtest_add_data_func("pxe/ne2000", "ne2k_pci", test_pxe_ipv4); - qtest_add_data_func("pxe/eepro100", "i82550", test_pxe_ipv4); - qtest_add_data_func("pxe/pcnet", "pcnet", test_pxe_ipv4); - qtest_add_data_func("pxe/rtl8139", "rtl8139", test_pxe_ipv4); - qtest_add_data_func("pxe/vmxnet3", "vmxnet3", test_pxe_ipv4); + test_batch(x86_tests_slow); } } else if (strcmp(arch, "ppc64") =3D=3D 0) { - qtest_add_data_func("pxe/spapr-vlan", "spapr-vlan", test_pxe_ipv4); + test_batch(ppc64_tests); if (g_test_slow()) { - qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_i= pv4); - qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); + test_batch(ppc64_tests_slow); } } else if (g_str_equal(arch, "s390x")) { - qtest_add_data_func("pxe/virtio-ccw", - "virtio-net-ccw,bootindex=3D1", test_pxe_ipv4); + test_batch(s390x_tests); } ret =3D g_test_run(); boot_sector_cleanup(disk); --=20 MST