From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4231-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 31509 invoked by alias); 29 Jun 2011 18:14:09 -0000
Received: (qmail 31492 invoked by uid 9447); 29 Jun 2011 18:14:08 -0000
Date: Wed, 29 Jun 2011 18:14:00 -0000
Message-ID: <20110629181408.31490.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test/lib aux.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: 2011-06/txt/msg00078.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2011-06-29 18:14:08

Modified files:
	test/lib       : aux.sh 

Log message:
	teardown aborts if it hits an error, so better teardown semaphores earlier
	as we need them later in the teardown process

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/lib/aux.sh.diff?cvsroot=lvm2&r1=1.17&r2=1.18

--- LVM2/test/lib/aux.sh	2011/06/29 17:37:30	1.17
+++ LVM2/test/lib/aux.sh	2011/06/29 18:14:08	1.18
@@ -61,6 +61,9 @@
 }
 
 teardown_devs() {
+	# Delete any remaining dm/udev semaphores
+	dmsetup udevcomplete_all -y
+
 	test -n "$PREFIX" && {
 		rm -rf $TESTDIR/dev/$PREFIX*
 
@@ -87,9 +90,6 @@
 	rm -f DEVICES # devs is set in prepare_devs()
 	rm -f LOOP
 
-	# Delete any remaining dm/udev semaphores
-	dmsetup udevcomplete_all -y
-
 	# Display any loop devices that failed to get torn down
 	losetup -a
 }