[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv2 1/4] tests/pxe-test: Remove unnecessary special ca
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCHv2 1/4] tests/pxe-test: Remove unnecessary special case test functions |
Date: |
Mon, 18 Dec 2017 21:04:01 +1100 |
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
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);
--
2.14.3