* Peter Maydell (peter.mayd...@linaro.org) wrote: > The postcopy/preempt tests seem to have a race which makes them hang > on the s390x CI runner. Disable them for the moment, while we > investigate. As with the other disabled subtest, you can opt back in > by setting QEMU_TEST_FLAKY_TESTS=1 in your environment. > > Suggested-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > --- > tests/qtest/migration-test.c | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index d4ab3934ed2..4643f7f49dc 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -2464,6 +2464,11 @@ int main(int argc, char **argv) > const char *arch = qtest_get_arch(); > g_autoptr(GError) err = NULL; > int ret; > + /* > + * Race condition suspected in the postcopy/preempt tests: see > + * > https://lore.kernel.org/qemu-devel/CAFEAcA-q1UwPePdHTzXNSX4i6Urh3j6h51kymy6=7szdafu...@mail.gmail.com/ > + */ > + bool skip_postcopy_preempt = getenv("QEMU_TEST_FLAKY_TESTS"); > > g_test_init(&argc, &argv, NULL); > > @@ -2500,9 +2505,11 @@ int main(int argc, char **argv) > qtest_add_func("/migration/postcopy/plain", test_postcopy); > qtest_add_func("/migration/postcopy/recovery/plain", > test_postcopy_recovery); > - qtest_add_func("/migration/postcopy/preempt/plain", > test_postcopy_preempt); > - qtest_add_func("/migration/postcopy/preempt/recovery/plain", > - test_postcopy_preempt_recovery); > + if (!skip_postcopy_preempt) { > + qtest_add_func("/migration/postcopy/preempt/plain", > test_postcopy_preempt); > + qtest_add_func("/migration/postcopy/preempt/recovery/plain", > + test_postcopy_preempt_recovery); > + } > } > > qtest_add_func("/migration/bad_dest", test_baddest); > @@ -2521,10 +2528,12 @@ int main(int argc, char **argv) > qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_psk); > qtest_add_func("/migration/postcopy/recovery/tls/psk", > test_postcopy_recovery_tls_psk); > - qtest_add_func("/migration/postcopy/preempt/tls/psk", > - test_postcopy_preempt_tls_psk); > - qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", > - test_postcopy_preempt_all); > + if (!skip_postcopy_preempt) { > + qtest_add_func("/migration/postcopy/preempt/tls/psk", > + test_postcopy_preempt_tls_psk); > + qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", > + test_postcopy_preempt_all); > + } > } > #ifdef CONFIG_TASN1 > qtest_add_func("/migration/precopy/unix/tls/x509/default-host", > -- > 2.34.1 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK