tests: Don't add extra padding if counter mod 40 is 0

This change only affects the output of tests that have an exact
multiple of 40 test cases. For example the domainschematest currently:

TEST: domainschematest
      ........................................ 40
      ........................................ 80
      ........................................ 120
      ........................................ 160
      ........................................                                         200 OK
PASS: domainschematest

It outputs additional 40 spaces on the last line.

The domainschematest output is fixed by the change in test-lib.sh. The
change in testutils.c fixes this for tests written in C. Currently no
C test has an exact multiple of 40 test cases, but I checked it and
the same problem exists there.

This patch stops that in both cases.
This commit is contained in:
Matthias Bolte 2010-03-20 18:08:00 +01:00
parent 81e99f014b
commit 8a7783c163
2 changed files with 7 additions and 5 deletions

View File

@ -55,10 +55,12 @@ test_final()
if test "$verbose" = "0" ; then
mod=`eval "expr \( $counter + 1 \) % 40"`
for i in `seq $mod 40`
do
echo -n " "
done
if test "$mod" != "0" -a "$mod" != "1" ; then
for i in `seq $mod 40`
do
echo -n " "
done
fi
if test "$status" = "0" ; then
printf " %-3d OK\n" $counter
else

View File

@ -537,7 +537,7 @@ cleanup:
virResetLastError();
if (!virTestGetVerbose()) {
int i;
for (i = (testCounter % 40) ; i < 40 ; i++)
for (i = (testCounter % 40) ; i > 0 && i < 40 ; i++)
fprintf(stderr, " ");
fprintf(stderr, " %-3d %s\n", testCounter, ret == 0 ? "OK" : "FAIL");
}