From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2961-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 24772 invoked by alias); 14 Apr 2010 12:04:25 -0000
Received: (qmail 24615 invoked by uid 9699); 14 Apr 2010 12:04:24 -0000
Date: Wed, 14 Apr 2010 12:04:00 -0000
Message-ID: <20100414120424.24613.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test test-utils.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-04/txt/msg00080.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-04-14 12:04:24

Modified files:
	test           : test-utils.sh 

Log message:
	SIGTERM testing clvmd before SIGKILL-ing it.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/test-utils.sh.diff?cvsroot=lvm2&r1=1.36&r2=1.37

--- LVM2/test/test-utils.sh	2010/04/13 08:01:53	1.36
+++ LVM2/test/test-utils.sh	2010/04/14 12:04:23	1.37
@@ -96,7 +96,11 @@
 	echo $LOOP
 	echo $PREFIX
 
-	test -n "$LOCAL_CLVMD" && kill -9 "$LOCAL_CLVMD"
+	test -n "$LOCAL_CLVMD" && {
+		kill "$LOCAL_CLVMD"
+		sleep .1
+		kill -9 "$LOCAL_CLVMD" || true
+	}
 
 	test -n "$PREFIX" && {
 		rm -rf $TESTDIR/dev/$PREFIX*