| Message ID | 1490361570-288658-1-git-send-email-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 24 March 2017 at 13:19, Christian Borntraeger <borntraeger@de.ibm.com> wrote: > a qemu with an empty s390 guest will exit very quickly. This races > against the testsuite reading from the console pipe leading to > intermittent test suite failures. Using -no-shutdown will keep > the guest running. > > Fixes: 864111f422ba (vl: exit qemu on guest panic if -no-shutdown is not set) > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > tests/boot-serial-test.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c > index 57edf6a..11f48b0 100644 > --- a/tests/boot-serial-test.c > +++ b/tests/boot-serial-test.c > @@ -79,8 +79,8 @@ static void test_machine(const void *data) > g_assert(fd != -1); > > args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s" > - " -serial chardev:serial0 %s", test->machine, > - tmpname, test->extra); > + " -no-shutdown -serial chardev:serial0 %s", > + test->machine, tmpname, test->extra); > > qtest_start(args); > unlink(tmpname); Applied to master, thanks. Let's see if this fixes the travis flapping... -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On 24 March 2017 at 13:19, Christian Borntraeger <borntraeger@de.ibm.com> wrote: >> a qemu with an empty s390 guest will exit very quickly. This races >> against the testsuite reading from the console pipe leading to >> intermittent test suite failures. Using -no-shutdown will keep >> the guest running. >> >> Fixes: 864111f422ba (vl: exit qemu on guest panic if -no-shutdown is not set) >> Reported-by: Peter Maydell <peter.maydell@linaro.org> >> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> >> --- >> tests/boot-serial-test.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c >> index 57edf6a..11f48b0 100644 >> --- a/tests/boot-serial-test.c >> +++ b/tests/boot-serial-test.c >> @@ -79,8 +79,8 @@ static void test_machine(const void *data) >> g_assert(fd != -1); >> >> args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s" >> - " -serial chardev:serial0 %s", test->machine, >> - tmpname, test->extra); >> + " -no-shutdown -serial chardev:serial0 %s", >> + test->machine, tmpname, test->extra); >> >> qtest_start(args); >> unlink(tmpname); > > Applied to master, thanks. Let's see if this fixes the travis flapping... A bit late as it is merged but I did test it on the reproduction case and ran 50 check-qtest-s390x while loading the system with a kernel compile. It previously failed after about 20 iterations. So: Tested-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> -- Alex Bennée
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index 57edf6a..11f48b0 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -79,8 +79,8 @@ static void test_machine(const void *data) g_assert(fd != -1); args = g_strdup_printf("-M %s,accel=tcg -chardev file,id=serial0,path=%s" - " -serial chardev:serial0 %s", test->machine, - tmpname, test->extra); + " -no-shutdown -serial chardev:serial0 %s", + test->machine, tmpname, test->extra); qtest_start(args); unlink(tmpname);
a qemu with an empty s390 guest will exit very quickly. This races against the testsuite reading from the console pipe leading to intermittent test suite failures. Using -no-shutdown will keep the guest running. Fixes: 864111f422ba (vl: exit qemu on guest panic if -no-shutdown is not set) Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- tests/boot-serial-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)