summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2017-03-24 14:19:30 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-03-24 13:39:50 +0000
commit7150d34a1d60851d73d6ab6783b12b1d25e68f86 (patch)
tree2eb80be297fa7c6f82c0ea0f9e7646924eaa15a8
parentbd517b4337dd9322b28945b72ae726f9cd269940 (diff)
downloadfocaccia-qemu-7150d34a1d60851d73d6ab6783b12b1d25e68f86.tar.gz
focaccia-qemu-7150d34a1d60851d73d6ab6783b12b1d25e68f86.zip
boot-serial-test: use -no-shutdown
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>
Message-id: 1490361570-288658-1-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tests/boot-serial-test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 57edf6af33..11f48b049c 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);