| Message ID | 20171215101651.13911-4-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | Improvements to pxe-test | expand |
On 15.12.2017 11:16, David Gibson wrote: > 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 <david@gibson.dropbear.id.au> > --- > tests/pxe-test.c | 26 ++++++++++++++++++++------ > 1 file changed, 20 insertions(+), 6 deletions(-) [...] > } 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); > } The NICs from ppc64_tests_slow are now never exercised with IPv4 ... maybe it would be better to do both: test_batch(ppc64_tests_slow, false); test_batch(ppc64_tests_slow, true); ? Thomas
On Fri, Dec 15, 2017 at 12:10:56PM +0100, Thomas Huth wrote: > On 15.12.2017 11:16, David Gibson wrote: > > 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 <david@gibson.dropbear.id.au> > > --- > > tests/pxe-test.c | 26 ++++++++++++++++++++------ > > 1 file changed, 20 insertions(+), 6 deletions(-) > [...] > > } 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); > > } > > The NICs from ppc64_tests_slow are now never exercised with IPv4 ... > maybe it would be better to do both: Yes they are: the ipv6 parameter to test_batch() makes it do IPv6 tests in addition to IPv4, unlike test_pxe_one() which just does one or the other. > test_batch(ppc64_tests_slow, false); > test_batch(ppc64_tests_slow, true);
On 15.12.2017 13:56, David Gibson wrote: > On Fri, Dec 15, 2017 at 12:10:56PM +0100, Thomas Huth wrote: >> On 15.12.2017 11:16, David Gibson wrote: >>> 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 <david@gibson.dropbear.id.au> >>> --- >>> tests/pxe-test.c | 26 ++++++++++++++++++++------ >>> 1 file changed, 20 insertions(+), 6 deletions(-) >> [...] >>> } 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); >>> } >> >> The NICs from ppc64_tests_slow are now never exercised with IPv4 ... >> maybe it would be better to do both: > > Yes they are: the ipv6 parameter to test_batch() makes it do IPv6 > tests in addition to IPv4, unlike test_pxe_one() which just does one > or the other. Ah, right, my bad, I mixed that up. And since we do not have any machine that can only do IPv6 but not IPv4, it's fine that test_batch() does both, so never mind, please ignore my above comment. Thomas
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);
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 <david@gibson.dropbear.id.au> --- tests/pxe-test.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)