public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/test/lib aux.sh utils.sh
@ 2011-06-29 18:18 agk
  0 siblings, 0 replies; only message in thread
From: agk @ 2011-06-29 18:18 UTC (permalink / raw)
  To: lvm-devel, lvm2-cvs

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

Modified files:
	test/lib       : aux.sh utils.sh 

Log message:
	make udev teardown conditional on using udev

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

--- LVM2/test/lib/aux.sh	2011/06/29 18:14:08	1.18
+++ LVM2/test/lib/aux.sh	2011/06/29 18:18:18	1.19
@@ -62,7 +62,7 @@
 
 teardown_devs() {
 	# Delete any remaining dm/udev semaphores
-	dmsetup udevcomplete_all -y
+	teardown_udev_cookies
 
 	test -n "$PREFIX" && {
 		rm -rf $TESTDIR/dev/$PREFIX*
--- LVM2/test/lib/utils.sh	2011/06/09 19:48:26	1.6
+++ LVM2/test/lib/utils.sh	2011/06/29 18:18:18	1.7
@@ -147,6 +147,12 @@
     fi
 }
 
+teardown_udev_cookies() {
+    if test "$DM_UDEV_SYNCHRONISATION" = 1; then
+	dmsetup udevcomplete_all -y
+    fi
+}
+
 skip() {
     touch SKIP_THIS_TEST
     exit 200


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-06-29 18:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-29 18:18 LVM2/test/lib aux.sh utils.sh agk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).