From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2918-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18618 invoked by alias); 7 Apr 2010 21:38:01 -0000
Received: (qmail 18604 invoked by uid 9699); 7 Apr 2010 21:38:01 -0000
Date: Wed, 07 Apr 2010 21:38:00 -0000
Message-ID: <20100407213801.18602.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/msg00037.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-04-07 21:38:01

Modified files:
	test           : test-utils.sh 

Log message:
	Don't forget to cd into $TESTDIR in test-utils.sh / prepare_testdir.

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

--- LVM2/test/test-utils.sh	2010/04/07 21:19:20	1.32
+++ LVM2/test/test-utils.sh	2010/04/07 21:38:01	1.33
@@ -86,6 +86,8 @@
 	export DM_DEV_DIR=$TESTDIR/dev
 	mkdir $LVM_SYSTEM_DIR $DM_DEV_DIR $DM_DEV_DIR/mapper $TESTDIR/lib
 
+	cd $TESTDIR
+
 	for i in `find $abs_top_builddir/daemons/dmeventd/plugins/ -name \*.so`; do
 		echo Setting up symlink from $i to $TESTDIR/lib
 		ln -s $i $TESTDIR/lib
@@ -381,7 +383,6 @@
 	prepare_testroot
 	prepare_lvmconf
 	prepare_clvmd
-	source ./lvm-utils.sh
 }
 
 LANG=C
@@ -390,6 +391,7 @@
 unset CDPATH
 
 . ./init.sh || { echo >&2 you must run make first; exit 1; }
+. ./lvm-utils.sh
 
 set -vexE -o pipefail
 aux prepare