On 19/10/2018 13:00, Thomas Huth wrote: > The migration test for s390x sometimes hangs when running with TCG, > similar to the problems that we have already observed with TCG for > the ppc64 guests. Thus disable the s390x test when we are not running > with KVM for now until the problem with TCG has been resolved. > > Signed-off-by: Thomas Huth <th...@redhat.com> > --- > tests/migration-test.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index b792025..06ca506 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -803,6 +803,22 @@ int main(int argc, char **argv) > return 0; > } > > + /* > + * Similar to ppc64, s390x seems to be touchy with TCG, so disable it > + * there until the problems are resolved > + */ > + if (g_str_equal(qtest_get_arch(), "s390x")) { > +#if defined(HOST_S390X) > + if (access("/dev/kvm", R_OK | W_OK)) { > + g_test_message("Skipping test: kvm not available"); > + return 0; > + } > +#else > + g_test_message("Skipping test: Need s390x host to work properly"); > + return 0; > +#endif > + } > + > tmpfs = mkdtemp(template); > if (!tmpfs) { > g_test_message("mkdtemp on path (%s): %s\n", template, > strerror(errno)); >
Reviewed-by: Laurent Vivier <lviv...@redhat.com>