Commit 5c96e091 authored by David Gibson's avatar David Gibson Committed by Michael S. Tsirkin
Browse files

tests/pxe-test: Remove unnecessary special case test functions 



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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8fc47c87

tests/pxe-test.c

+3 −12
Original line number Diff line number Diff line
@@ -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);