| Message ID | 1518761564-9899-1-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 16/02/2018 07:12, Thomas Huth wrote: > 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 <thuth@redhat.com> > --- > @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') { > Queued in the meanwhile, thanks. Paolo
On 21.02.2018 12:05, Paolo Bonzini wrote: > On 16/02/2018 07:12, Thomas Huth wrote: >> 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 <thuth@redhat.com> >> --- >> @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') { >> > > Queued in the meanwhile, thanks. Thanks, but Peter already applied it to fix the "make check" failures: https://git.qemu.org/?p=qemu.git;a=commit;h=5e5432b766c424a5d1 Thomas
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') {
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 <thuth@redhat.com> --- @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(-)