508ceb61e3
Update to v3.0.0 version OBS-URL: https://build.opensuse.org/request/show/630954 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=424
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From eb6fab8ccd1380173483e35ff830d7c829d79742 Mon Sep 17 00:00:00 2001
|
|
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Fri, 17 Aug 2018 17:14:04 +0100
|
|
Subject: [PATCH] tests/boot-serial-test: Bump timeout to 6 minutes
|
|
|
|
On a SPARC host that I'm using as a build test machine, the
|
|
boot-serial-test for the SPARC guest machines takes about 65
|
|
seconds to execute. This means that it hits the current
|
|
60 second timer on these tests. Push the timeout up so
|
|
that it doesn't trigger spuriously on slow hosts like this one.
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
|
Message-id: 20180817161404.9420-1-peter.maydell@linaro.org
|
|
(cherry picked from commit 627fce617868df87b3757375a2a0318ad2beb381)
|
|
[BR: We have seen this issue occasionally for qemu-testsuite on armv7l]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.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 952a2e7ead..7fbf7b35de 100644
|
|
--- a/tests/boot-serial-test.c
|
|
+++ b/tests/boot-serial-test.c
|
|
@@ -116,8 +116,8 @@ static bool check_guest_output(const testdef_t *test, int fd)
|
|
int i, nbr = 0, pos = 0, ccnt;
|
|
char ch;
|
|
|
|
- /* Poll serial output... Wait at most 60 seconds */
|
|
- for (i = 0; i < 6000; ++i) {
|
|
+ /* Poll serial output... Wait at most 360 seconds */
|
|
+ for (i = 0; i < 36000; ++i) {
|
|
ccnt = 0;
|
|
while (ccnt++ < 512 && (nbr = read(fd, &ch, 1)) == 1) {
|
|
if (ch == test->expect[pos]) {
|