From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13801 invoked by alias); 13 Jan 2011 11:02:56 -0000 Received: (qmail 13784 invoked by uid 9737); 13 Jan 2011 11:02:56 -0000 Date: Thu, 13 Jan 2011 11:02:00 -0000 Message-ID: <20110113110256.13782.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/lib harness.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-01/txt/msg00058.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-01-13 11:02:55 Modified files: test/lib : harness.c Log message: 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. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/harness.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4 --- LVM2/test/lib/harness.c 2011/01/10 13:25:22 1.3 +++ LVM2/test/lib/harness.c 2011/01/13 11:02:55 1.4 @@ -54,10 +54,10 @@ #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 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) {