On Tue, May 28, 2024 at 10:42:06AM +1000, Nicholas Piggin wrote: > This test is already starting to bitrot, so first remove it from ifdef > and fix compile issues. ppc64 transfers about 2MB, so bump the size > threshold too. > > It was said to be broken on aarch64 but it may have been the limited shm > size under gitlab CI. The test is now excluded from running on CI so it > shouldn't cause too much annoyance. > > So let's try enable it. > > Cc: Yury Kotov <yury-ko...@yandex-team.ru> > Cc: Dr. David Alan Gilbert <dgilb...@redhat.com>
Dave's new email is: d...@treblig.org Please feel free to use it in a repost. Thanks, > Signed-off-by: Nicholas Piggin <npig...@gmail.com> > --- > tests/qtest/migration-test.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 04bf1c0092..8247ed98f2 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1893,14 +1893,15 @@ static void > test_precopy_unix_tls_x509_override_host(void) > #endif /* CONFIG_TASN1 */ > #endif /* CONFIG_GNUTLS */ > > -#if 0 > -/* Currently upset on aarch64 TCG */ > static void test_ignore_shared(void) > { > g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); > QTestState *from, *to; > + MigrateStart args = { > + .use_shmem = true, > + }; > > - if (test_migrate_start(&from, &to, uri, false, true, NULL, NULL)) { > + if (test_migrate_start(&from, &to, uri, &args)) { > return; > } > > @@ -1925,11 +1926,11 @@ static void test_ignore_shared(void) > wait_for_migration_complete(from); > > /* Check whether shared RAM has been really skipped */ > - g_assert_cmpint(read_ram_property_int(from, "transferred"), <, 1024 * > 1024); > + g_assert_cmpint(read_ram_property_int(from, "transferred"), <, > + 4 * 1024 * 1024); > > test_migrate_end(from, to, true); > } > -#endif > > static void * > test_migrate_xbzrle_start(QTestState *from, > @@ -3580,7 +3581,8 @@ int main(int argc, char **argv) > #endif /* CONFIG_TASN1 */ > #endif /* CONFIG_GNUTLS */ > > - /* migration_test_add("/migration/ignore_shared", test_ignore_shared); */ > + migration_test_add("/migration/ignore_shared", test_ignore_shared); > + > #ifndef _WIN32 > migration_test_add("/migration/precopy/fd/tcp", > test_migrate_precopy_fd_socket); > -- > 2.43.0 > -- Peter Xu