From 8a7783c16378e4684d121ad49a65659f8d33a9cf Mon Sep 17 00:00:00 2001
From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Sat, 20 Mar 2010 18:08:00 +0100
Subject: [PATCH] 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.
---
 tests/test-lib.sh | 10 ++++++----
 tests/testutils.c |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 43265f3a9a..57fd43893d 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -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
diff --git a/tests/testutils.c b/tests/testutils.c
index 4f17e5176f..2f61aadc84 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -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");
     }