Hotfix to stop harness busylooping

Harness seems to be able to busyloop in while cycle and not moving forward
for certain buffer - so check whethere there was some progress.
This fix allows to continue after failed cluster test.

Fix gcc warning for hiding global variable 's' -> sig.

diff --git a/test/lib/harness.c b/test/lib/harness.c
index 5c6dd4fb2de9d28b90ea8363a3c33b9eca760df0..2bf2c81403a5ad3e41e809baa984ff774e97aef2 100644 (file)
--- a/test/lib/harness.c
+++ b/test/lib/harness.c
@@ -54,10 +54,10 @@ static struct subst subst[2];
 #define FAILED 2
 #define WARNED 3
 
-static void handler( int s ) {
-       signal( s, SIG_DFL );
-       kill( pid, s );
-       die = s;
+static void handler( int sig ) {
+       signal( sig, SIG_DFL );
+       kill( pid, sig );
+       die = sig;
 }
 
 static int outline(char *buf, int start, int force) {
@@ -110,10 +110,12 @@ static int outline(char *buf, int start, int force) {
 }
 
 static void dump(void) {
-        int counter = 0;
+       int counter_last, counter = 0;
 
-        while ( counter < readbuf_used )
-                counter = outline( readbuf, counter, 1 );
+       while ( counter < readbuf_used && counter != counter_last ) {
+               counter_last = counter;
+               counter = outline( readbuf, counter, 1 );
+       }
 }
 
 static void clear(void) {