* Nicholas Piggin (npig...@gmail.com) 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 due to the > limited shm size under Gitlab CI. Now that it uses /tmp, enable it.
If it does fail, lets see if we can figure out how, i.e. whether it's the shm size or something else. Reviewed-by: Dr. David Alan Gilbert <d...@treblig.org> > Cc: Yury Kotov <yury-ko...@yandex-team.ru> > Cc: Dr. David Alan Gilbert <d...@treblig.org> > Signed-off-by: Nicholas Piggin <npig...@gmail.com> > --- > tests/qtest/migration-test.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index de380757be..86eace354e 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1855,8 +1855,6 @@ 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); > @@ -1865,7 +1863,7 @@ static void test_ignore_shared(void) > .use_memfile = true, > }; > > - if (test_migrate_start(&from, &to, uri, false, true, NULL, NULL)) { > + if (test_migrate_start(&from, &to, uri, &args)) { > return; > } > > @@ -1890,11 +1888,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, > @@ -3535,7 +3533,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 > -- -----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/