From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3137-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 32363 invoked by alias); 24 May 2010 17:18:27 -0000
Received: (qmail 32346 invoked by uid 9664); 24 May 2010 17:18:25 -0000
Date: Mon, 24 May 2010 17:18:00 -0000
Message-ID: <20100524171825.32344.qmail@sourceware.org>
From: mbroz@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-05/txt/msg00100.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2010-05-24 17:18:12

Modified files:
	test           : test-utils.sh 

Log message:
	Replace lvm.conf instead of truncating it.

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

--- LVM2/test/test-utils.sh	2010/05/24 15:32:21	1.44
+++ LVM2/test/test-utils.sh	2010/05/24 17:18:05	1.45
@@ -358,7 +358,7 @@
 		filter='[ "a/dev\/mirror/", "a/dev\/mapper\/.*pv[0-9_]*$/", "r/.*/" ]'
         locktype=
 	if test -n "$LVM_TEST_LOCKING"; then locktype="locking_type = $LVM_TEST_LOCKING"; fi
-	cat > $TESTDIR/etc/lvm.conf <<-EOF
+	cat > $TESTDIR/etc/lvm.conf.new <<-EOF
   $LVM_TEST_CONFIG
   devices {
     dir = "$DM_DEV_DIR"
@@ -391,6 +391,8 @@
     polling_interval = 0
   }
 EOF
+	# FIXME remove this workaround after mmap & truncating file problems solved
+	mv $TESTDIR/etc/lvm.conf.new $TESTDIR/etc/lvm.conf
 	cat $TESTDIR/etc/lvm.conf
 }