From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emZGd-0005Ax-Hc for qemu-devel@nongnu.org; Fri, 16 Feb 2018 01:13:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emZGY-00039K-Gd for qemu-devel@nongnu.org; Fri, 16 Feb 2018 01:13:07 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54902 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emZGY-000392-Bk for qemu-devel@nongnu.org; Fri, 16 Feb 2018 01:13:02 -0500 From: Thomas Huth Date: Fri, 16 Feb 2018 07:12:44 +0100 Message-Id: <1518761564-9899-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH] tests/boot-serial-test: Fix problem with timeout due to dropped characters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Richard Henderson , Paolo Bonzini Commit 92b540dac9fc3a5 introduce a counter to handle the timeouts in a better way. But in case ccnt reaches 512, the current read character is ignored - and if that character is part of the string that we are looking for, the test fails to match the string. Almost all of the tests look for a string within the first 512 bytes of firmware output, so the problem never triggered there. But the hppa test that has been added recently looks for a longer string at the very end of a long output, thus there's a chance that we miss a character there so that the test fails unexpectedly. Fix it by *not* reading and dropping a character if the counter reaches 512. Fixes: 92b540dac9fc3a572c7342edd0b073000f5a6abf Signed-off-by: Thomas Huth --- @Peter: Since this fixes the problem with running "make check", could you maybe apply this directly to the master branch? Thanks, and sorry for the inconvenience! tests/boot-serial-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index ea87a80..696f7a3 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -101,7 +101,7 @@ static void check_guest_output(const testdef_t *test, int fd) /* Poll serial output... Wait at most 60 seconds */ for (i = 0; i < 6000; ++i) { ccnt = 0; - while ((nbr = read(fd, &ch, 1)) == 1 && ccnt++ < 512) { + while (ccnt++ < 512 && (nbr = read(fd, &ch, 1)) == 1) { if (ch == test->expect[pos]) { pos += 1; if (test->expect[pos] == '\0') { -- 1.8.3.1