LVM2/test/lib test.sh

LVM2/test/lib test.sh

[mornfall]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2011-08-31 12:42:55

Modified files:
	test/lib       : test.sh 

Log message:
	Do not call prepare_lvmetad just yet in tests.

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

--- LVM2/test/lib/test.sh	2011/08/31 11:31:58	1.5
+++ LVM2/test/lib/test.sh	2011/08/31 12:42:55	1.6
@@ -54,7 +54,6 @@
 set -eE -o pipefail
 aux lvmconf
 aux prepare_clvmd
-aux prepare_lvmetad
 echo "@TESTDIR=$TESTDIR"
 echo "@PREFIX=$PREFIX"
 

LVM2/test/lib test.sh

[mornfall]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2011-02-09 17:57:14

Modified files:
	test/lib       : test.sh 

Log message:
	Allow overriding the DM_DEV_DIR used by the test suite (fixes BZ 672796). Use
	like this:
	
	# LVM_TEST_DEVDIR=/tmp/dev make check

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

--- LVM2/test/lib/test.sh	2011/01/05 00:26:19	1.2
+++ LVM2/test/lib/test.sh	2011/02/09 17:57:14	1.3
@@ -31,8 +31,11 @@
 trap 'aux teardown' EXIT # don't forget to clean up
 
 export LVM_SYSTEM_DIR=$TESTDIR/etc
-export DM_DEV_DIR=$TESTDIR/dev
-mkdir $LVM_SYSTEM_DIR $DM_DEV_DIR $DM_DEV_DIR/mapper $TESTDIR/lib
+DM_DEV_DIR=$TESTDIR/dev
+test -n "$LVM_TEST_DEVDIR" && DM_DEV_DIR="$LVM_TEST_DEVDIR"
+export DM_DEV_DIR
+mkdir $LVM_SYSTEM_DIR $TESTDIR/lib
+mkdir -p $DM_DEV_DIR $DM_DEV_DIR/mapper
 
 cd $TESTDIR