From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1566-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 20371 invoked by alias); 30 Sep 2008 17:56:54 -0000
Received: (qmail 20357 invoked by uid 9699); 30 Sep 2008 17:56:54 -0000
Date: Tue, 30 Sep 2008 17:56:00 -0000
Message-ID: <20080930175654.20355.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test t-vgsplit-operation.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: 2008-09/txt/msg00046.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2008-09-30 17:56:54

Modified files:
	test           : t-vgsplit-operation.sh 

Log message:
	Conversion of t-vgsplit-operation.sh by jstava.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-vgsplit-operation.sh.diff?cvsroot=lvm2&r1=1.21&r2=1.22

--- LVM2/test/t-vgsplit-operation.sh	2008/04/11 14:06:16	1.21
+++ LVM2/test/t-vgsplit-operation.sh	2008/09/30 17:56:54	1.22
@@ -9,323 +9,282 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-test_description='Test vgsplit operation, including different LV types'
-privileges_required_=1
+# Test vgsplit operation, including different LV types
 
-. ./test-lib.sh
+. ./test-utils.sh
 
-cleanup_()
-{
-  test -n "$d1" && losetup -d "$d1"
-  test -n "$d2" && losetup -d "$d2"
-  test -n "$d3" && losetup -d "$d3"
-  test -n "$d4" && losetup -d "$d4"
-  test -n "$d5" && losetup -d "$d5"
-  rm -f "$f1" "$f2" "$f3" "$f4" "$f5"
+COMM() {  
+	LAST_TEST="$@"
 }
 
+prepare_pvs 5 257
 # FIXME: paramaterize lvm1 vs lvm2 metadata; most of these tests should run
 # fine with lvm1 metadata as well; for now, just add disks 5 and 6 as lvm1
 # metadata
-test_expect_success \
-  'set up temp files, loopback devices, PVs, vgnames' \
-  'f1=$(pwd)/1 && d1=$(loop_setup_ "$f1") &&
-   f2=$(pwd)/2 && d2=$(loop_setup_ "$f2") &&
-   f3=$(pwd)/3 && d3=$(loop_setup_ "$f3") &&
-   f4=$(pwd)/4 && d4=$(loop_setup_ "$f4") &&
-   f5=$(pwd)/5 && d5=$(loop_setup_ "$f5") &&
-   vg1=$(this_test_)-test-vg1-$$          &&
-   vg2=$(this_test_)-test-vg2-$$          &&
-   lv1=$(this_test_)-test-lv1-$$          &&
-   lv2=$(this_test_)-test-lv2-$$          &&
-   lv3=$(this_test_)-test-lv3-$$          &&
-   pvcreate $d1 $d2 $d3 $d4 $d5'
 
 #
 # vgsplit can be done into a new or existing VG
 #
 for i in new existing
 do
-#
-# We can have PVs or LVs on the cmdline
-#
-for j in PV LV
-do
-test_expect_success \
-  "vgsplit correctly splits single linear LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 &&
-   if [ $i == existing ]; then
-      vgcreate $vg2 $d3 $d4
-   fi &&
-   lvcreate -l 4 -n $lv1 $vg1 $d1 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d1
-   else
-     vgsplit -n $lv1 $vg1 $vg2
-   fi &&
-   vg_validate_pvlv_counts_ $vg1 1 0 0 &&
-   if [ $i == existing ]; then
-      vg_validate_pvlv_counts_ $vg2 3 1 0
-   else
-      vg_validate_pvlv_counts_ $vg2 1 1 0
-   fi &&
-   lvremove -f $vg2/$lv1 &&
-   vgremove -f $vg2 &&
-   vgremove -f $vg1'
-
-test_expect_success \
-  "vgsplit correctly splits single striped LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 &&
-   if [ $i == existing ]; then
-      vgcreate $vg2 $d3 $d4
-   fi &&
-   lvcreate -l 4 -i 2 -n $lv1 $vg1 $d1 $d2 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d1 $d2
-   else
-     vgsplit -n $lv1 $vg1 $vg2
-   fi &&
-   if [ $i == existing ]; then
-     vg_validate_pvlv_counts_ $vg2 4 1 0
-   else
-     vg_validate_pvlv_counts_ $vg2 2 1 0
-   fi &&
-   lvremove -f $vg2/$lv1 &&
-   vgremove -f $vg2'
-
-test_expect_success \
-  "vgsplit correctly splits mirror LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 $d3 &&
-   if [ $i == existing ]; then
-     vgcreate $vg2 $d4
-   fi &&
-   lvcreate -l 64 -m1 -n $lv1 $vg1 $d1 $d2 $d3 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d1 $d2 $d3
-   else
-     vgsplit -n $lv1 $vg1 $vg2
-   fi &&
-   if [ $i == existing ]; then
-     vg_validate_pvlv_counts_ $vg2 4 1 0
-   else
-     vg_validate_pvlv_counts_ $vg2 3 1 0
-   fi &&
-   lvremove -f $vg2/$lv1 &&
-   vgremove -f $vg2'
-
-test_expect_success \
-  "vgsplit correctly splits origin and snapshot LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 &&
-   if [ $i == existing ]; then
-     vgcreate $vg2 $d3 $d4
-   fi &&
-   lvcreate -l 64 -i 2 -n $lv1 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d1 $d2
-   else
-     vgsplit -n $lv1 $vg1 $vg2
-   fi &&
-   if [ $i == existing ]; then
-     vg_validate_pvlv_counts_ $vg2 4 2 1
-   else
-     vg_validate_pvlv_counts_ $vg2 2 2 1
-   fi &&
-   lvremove -f $vg2/$lv2 &&
-   lvremove -f $vg2/$lv1 &&
-   vgremove -f $vg2'
-
-test_expect_success \
-  "vgsplit correctly splits linear LV but not snap+origin LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 &&
-   if [ $i == existing ]; then
-     vgcreate $vg2 $d3
-   fi &&
-   lvcreate -l 64 -i 2 -n $lv1 $vg1 &&
-   lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 &&
-   vgextend $vg1 $d4 &&
-   lvcreate -l 64 -n $lv3 $vg1 $d4 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d4
-   else
-     vgsplit -n $lv3 $vg1 $vg2
-   fi &&
-   if [ $i == existing ]; then
-     vg_validate_pvlv_counts_ $vg2 2 1 0
-     vg_validate_pvlv_counts_ $vg1 2 2 1
-   else
-     vg_validate_pvlv_counts_ $vg2 1 1 0
-     vg_validate_pvlv_counts_ $vg1 2 2 1
-   fi &&
-   lvremove -f $vg1/$lv2 &&
-   lvremove -f $vg1/$lv1 &&
-   lvremove -f $vg2/$lv3 &&
-   vgremove -f $vg1 &&
-   vgremove -f $vg2'
-
-test_expect_success \
-  "vgsplit correctly splits linear LV but not mirror LV into $i VG ($j args)" \
-  'vgcreate $vg1 $d1 $d2 $d3 &&
-   if [ $i == existing ]; then
-     vgcreate $vg2 $d5
-   fi &&
-   lvcreate -l 64 -m1 -n $lv1 $vg1 $d1 $d2 $d3 &&
-   vgextend $vg1 $d4 &&
-   lvcreate -l 64 -n $lv2 $vg1 $d4 &&
-   vgchange -an $vg1 &&
-   if [ $j == PV ]; then
-     vgsplit $vg1 $vg2 $d4
-   else
-     vgsplit -n $lv2 $vg1 $vg2
-   fi &&
-   if [ $i == existing ]; then
-     vg_validate_pvlv_counts_ $vg1 3 2 0
-     vg_validate_pvlv_counts_ $vg2 2 1 0
-   else
-     vg_validate_pvlv_counts_ $vg1 3 2 0
-     vg_validate_pvlv_counts_ $vg2 1 1 0
-   fi &&
-   lvremove -f $vg1/$lv1 &&
-   lvremove -f $vg2/$lv2 &&
-   vgremove -f $vg1 &&
-   vgremove -f $vg2'
+	#
+	# We can have PVs or LVs on the cmdline
+	#
+	for j in PV LV
+	do
+COMM "vgsplit correctly splits single linear LV into $i VG ($j args)"
+		vgcreate $vg1 $dev1 $dev2 
+		if [ $i == existing ]; then
+		   vgcreate $vg2 $dev3 $dev4
+		fi 
+		lvcreate -l 4 -n $lv1 $vg1 $dev1 
+		vgchange -an $vg1 
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev1
+		else
+		  vgsplit -n $lv1 $vg1 $vg2
+		fi 
+		vg_validate_pvlv_counts_ $vg1 1 0 0 
+		if [ $i == existing ]; then
+		   aux vg_validate_pvlv_counts_ $vg2 3 1 0
+		else
+		   aux vg_validate_pvlv_counts_ $vg2 1 1 0
+		fi 
+		lvremove -f $vg2/$lv1 
+		vgremove -f $vg2 
+		vgremove -f $vg1
+
+COMM "vgsplit correctly splits single striped LV into $i VG ($j args)"
+		vgcreate $vg1 $dev1 $dev2 
+		if [ $i == existing ]; then
+		   vgcreate $vg2 $dev3 $dev4
+		fi 
+		lvcreate -l 4 -i 2 -n $lv1 $vg1 $dev1 $dev2 
+		vgchange -an $vg1 
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev1 $dev2
+		else
+		  vgsplit -n $lv1 $vg1 $vg2
+		fi 
+		if [ $i == existing ]; then
+		  aux vg_validate_pvlv_counts_ $vg2 4 1 0
+		else
+		  aux vg_validate_pvlv_counts_ $vg2 2 1 0
+		fi 
+		lvremove -f $vg2/$lv1 
+		vgremove -f $vg2
+
+COMM "vgsplit correctly splits mirror LV into $i VG ($j args)" 
+		vgcreate $vg1 $dev1 $dev2 $dev3 
+		if [ $i == existing ]; then
+		  vgcreate $vg2 $dev4
+		fi 
+		lvcreate -l 64 -m1 -n $lv1 $vg1 $dev1 $dev2 $dev3 
+		vgchange -an $vg1 
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev1 $dev2 $dev3
+		else
+		  vgsplit -n $lv1 $vg1 $vg2
+		fi 
+		if [ $i == existing ]; then
+		  aux vg_validate_pvlv_counts_ $vg2 4 1 0
+		else
+		  aux vg_validate_pvlv_counts_ $vg2 3 1 0
+		fi 
+		lvremove -f $vg2/$lv1 
+		vgremove -f $vg2
+
+COMM "vgsplit correctly splits origin and snapshot LV into $i VG ($j args)" 
+		vgcreate $vg1 $dev1 $dev2 
+		if [ $i == existing ]; then
+		  vgcreate $vg2 $dev3 $dev4
+		fi 
+		lvcreate -l 64 -i 2 -n $lv1 $vg1 $dev1 $dev2 
+		lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 
+		vgchange -an $vg1 
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev1 $dev2
+		else
+		  vgsplit -n $lv1 $vg1 $vg2
+		fi 
+		if [ $i == existing ]; then
+		  aux vg_validate_pvlv_counts_ $vg2 4 2 1
+		else
+		  aux vg_validate_pvlv_counts_ $vg2 2 2 1
+		fi 
+		lvremove -f $vg2/$lv2 
+		lvremove -f $vg2/$lv1 
+		vgremove -f $vg2
+
+COMM "vgsplit correctly splits linear LV but not snap+origin LV into $i VG ($j args)" 
+		vgcreate $vg1 $dev1 $dev2 
+		if [ $i == existing ]; then
+		  vgcreate $vg2 $dev3
+		fi 
+		lvcreate -l 64 -i 2 -n $lv1 $vg1 
+		lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 
+		vgextend $vg1 $dev4 
+		lvcreate -l 64 -n $lv3 $vg1 $dev4 
+		vgchange -an $vg1 
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev4
+		else
+		  vgsplit -n $lv3 $vg1 $vg2
+		fi 
+		if [ $i == existing ]; then
+		  aux vg_validate_pvlv_counts_ $vg2 2 1 0
+		  aux vg_validate_pvlv_counts_ $vg1 2 2 1
+		else
+		  aux vg_validate_pvlv_counts_ $vg2 1 1 0
+		  aux vg_validate_pvlv_counts_ $vg1 2 2 1
+		fi 
+		lvremove -f $vg1/$lv2 
+		lvremove -f $vg1/$lv1 
+		lvremove -f $vg2/$lv3 
+		vgremove -f $vg1 
+		vgremove -f $vg2
+
+COMM "vgsplit correctly splits linear LV but not mirror LV into $i VG ($j args)" 
+		vgcreate $vg1 $dev1 $dev2 $dev3 
+		if [ $i == existing ]; then
+		  vgcreate $vg2 $dev5
+		fi 
+		lvcreate -l 64 -m1 -n $lv1 $vg1 $dev1 $dev2 $dev3 
+		vgextend $vg1 $dev4 
+		lvcreate -l 64 -n $lv2 $vg1 $dev4 
+		vgchange -an $vg1 
+		vgs
+		lvs 
+		pvs
+		if [ $j == PV ]; then
+		  vgsplit $vg1 $vg2 $dev4
+		else
+		  vgsplit -n $lv2 $vg1 $vg2
+		fi 
+		if [ $i == existing ]; then
+		  aux vg_validate_pvlv_counts_ $vg1 3 1 0
+		  aux vg_validate_pvlv_counts_ $vg2 2 1 0
+		else
+		vgs
+		lvs 
+		pvs
+		  aux vg_validate_pvlv_counts_ $vg1 3 1 0
+		  aux vg_validate_pvlv_counts_ $vg2 1 1 0
+		fi 
+		lvremove -f $vg1/$lv1 
+		lvremove -f $vg2/$lv2 
+		vgremove -f $vg1 
+		vgremove -f $vg2
 
-done
+	done
 done
 
 #
 # Test more complex setups where the code has to find associated PVs and
 # LVs to split the VG correctly
 # 
-test_expect_success \
-  "vgsplit fails splitting 3 striped LVs into VG when only 1 LV specified" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 4 -n $lv1 -i 2 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -n $lv2 -i 2 $vg1 $d2 $d3 &&
-   lvcreate -l 4 -n $lv3 -i 2 $vg1 $d3 $d4 &&
-   vgchange -an $vg1 &&
-   vgsplit -n $lv1 $vg1 $vg2;
-   status=$?; echo status=$status; test $status = 5 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit fails splitting one LV with 2 snapshots, only origin LV specified" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -n $lv2 -s $vg1/$lv1 &&
-   lvcreate -l 4 -n $lv3 -s $vg1/$lv1 &&
-   vg_validate_pvlv_counts_ $vg1 4 3 2 &&
-   vgchange -an $vg1 &&
-   vgsplit -n $lv1 $vg1 $vg2;
-   status=$?; echo status=$status; test $status = 5 &&
-   lvremove -f $vg1/$lv2 &&
-   lvremove -f $vg1/$lv3 &&
-   lvremove -f $vg1/$lv1 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit fails splitting one LV with 2 snapshots, only snapshot LV specified" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -n $lv2 -s $vg1/$lv1 &&
-   lvcreate -l 4 -n $lv3 -s $vg1/$lv1 &&
-   vg_validate_pvlv_counts_ $vg1 4 3 2 &&
-   vgchange -an $vg1 &&
-   vgsplit -n $lv2 $vg1 $vg2;
-   status=$?; echo status=$status; test $status = 5 &&
-   lvremove -f $vg1/$lv2 &&
-   lvremove -f $vg1/$lv3 &&
-   lvremove -f $vg1/$lv1 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit fails splitting one mirror LV, only one PV specified" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 -m1 $vg1 $d1 $d2 $d3 &&
-   vg_validate_pvlv_counts_ $vg1 4 4 0 &&
-   vgchange -an $vg1 &&
-   vgsplit $vg1 $vg2 $d2 &&
-   status=$?; echo status=$status; test $status = 5 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit fails splitting 1 mirror + 1 striped LV, only striped LV specified" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 -m1 $vg1 $d1 $d2 $d3 &&
-   lvcreate -l 16 -n $lv2 -i 2 $vg1 $d3 $d4 &&
-   vg_validate_pvlv_counts_ $vg1 4 2 0 &&
-   vgchange -an $vg1 &&
-   vgsplit -n $lv2 $vg1 $vg2 2>err;
-   status=$?; echo status=$status; test $status = 5 &&
-   vgremove -ff $vg1'
+COMM "vgsplit fails splitting 3 striped LVs into VG when only 1 LV specified" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 4 -n $lv1 -i 2 $vg1 $dev1 $dev2 
+lvcreate -l 4 -n $lv2 -i 2 $vg1 $dev2 $dev3 
+lvcreate -l 4 -n $lv3 -i 2 $vg1 $dev3 $dev4 
+vgchange -an $vg1 
+not vgsplit -n $lv1 $vg1 $vg2
+vgremove -ff $vg1
+
+COMM "vgsplit fails splitting one LV with 2 snapshots, only origin LV specified" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 $vg1 $dev1 $dev2 
+lvcreate -l 4 -n $lv2 -s $vg1/$lv1 
+lvcreate -l 4 -n $lv3 -s $vg1/$lv1 
+vg_validate_pvlv_counts_ $vg1 4 3 2 
+vgchange -an $vg1 
+not vgsplit -n $lv1 $vg1 $vg2;
+lvremove -f $vg1/$lv2 
+lvremove -f $vg1/$lv3 
+lvremove -f $vg1/$lv1 
+vgremove -ff $vg1
+
+COMM "vgsplit fails splitting one LV with 2 snapshots, only snapshot LV specified" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 $vg1 $dev1 $dev2 
+lvcreate -l 4 -n $lv2 -s $vg1/$lv1 
+lvcreate -l 4 -n $lv3 -s $vg1/$lv1 
+vg_validate_pvlv_counts_ $vg1 4 3 2 
+vgchange -an $vg1 
+not vgsplit -n $lv2 $vg1 $vg2
+lvremove -f $vg1/$lv2 
+lvremove -f $vg1/$lv3 
+lvremove -f $vg1/$lv1 
+vgremove -ff $vg1
+
+COMM "vgsplit fails splitting one mirror LV, only one PV specified" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 -m1 $vg1 $dev1 $dev2 $dev3 
+vg_validate_pvlv_counts_ $vg1 4 1 0 
+vgchange -an $vg1 
+not vgsplit $vg1 $vg2 $dev2 
+vgremove -ff $vg1
+
+COMM "vgsplit fails splitting 1 mirror + 1 striped LV, only striped LV specified" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 -m1 $vg1 $dev1 $dev2 $dev3 
+lvcreate -l 16 -n $lv2 -i 2 $vg1 $dev3 $dev4 
+vg_validate_pvlv_counts_ $vg1 4 2 0 
+vgchange -an $vg1 
+not vgsplit -n $lv2 $vg1 $vg2 2>err
+vgremove -ff $vg1
 
 #
 # Verify vgsplit rejects active LVs only when active LVs involved in split
 #
-test_expect_success \
-  "vgsplit fails, active mirror involved in split" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 -m1 $vg1 $d1 $d2 $d3 &&
-   lvcreate -l 16 -n $lv2 $vg1 $d4 &&
-   lvchange -an $vg1/$lv2 &&
-   vg_validate_pvlv_counts_ $vg1 4 2 0 &&
-   vgsplit -n $lv1 $vg1 $vg2;
-   status=$?; echo status=$status; test $status = 5 &&
-   vg_validate_pvlv_counts_ $vg1 4 2 0 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit succeeds, active mirror not involved in split" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 16 -n $lv1 -m1 $vg1 $d1 $d2 $d3 &&
-   lvcreate -l 16 -n $lv2 $vg1 $d4 &&
-   lvchange -an $vg1/$lv2 &&
-   vg_validate_pvlv_counts_ $vg1 4 2 0 &&
-   vgsplit -n $lv2 $vg1 $vg2 &&
-   vg_validate_pvlv_counts_ $vg1 3 1 0 &&
-   vg_validate_pvlv_counts_ $vg2 1 1 0 &&
-   vgremove -ff $vg1 &&
-   vgremove -ff $vg2'
-
-test_expect_success \
-  "vgsplit fails, active snapshot involved in split" \
-  'vgcreate $vg1 $d1 $d2 $d3 $d4 &&
-   lvcreate -l 64 -i 2 -n $lv1 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 &&
-   lvcreate -l 64 -i 2 -n $lv3 $vg1 $d3 $d4 &&
-   lvchange -an $vg1/$lv3 &&
-   vg_validate_pvlv_counts_ $vg1 4 3 1 &&
-   vgsplit -n $lv2 $vg1 $vg2;
-   status=$?; echo status=$status; test $status = 5 &&
-   vg_validate_pvlv_counts_ $vg1 4 3 1 &&
-   lvremove -f $vg1/$lv2 &&
-   vgremove -ff $vg1'
-
-test_expect_success \
-  "vgsplit succeeds, active snapshot not involved in split" \
-  'vgcreate $vg1 $d1 $d2 $d3 &&
-   lvcreate -l 64 -i 2 -n $lv1 $vg1 $d1 $d2 &&
-   lvcreate -l 4 -s -n $lv2 $vg1/$lv1 &&
-   vgextend $vg1 $d4 &&
-   lvcreate -l 64 -n $lv3 $vg1 $d4 &&
-   lvchange -an $vg1/$lv3 &&
-   vg_validate_pvlv_counts_ $vg1 4 3 1 &&
-   vgsplit -n $lv3 $vg1 $vg2 &&
-   vg_validate_pvlv_counts_ $vg1 3 2 1 &&
-   vg_validate_pvlv_counts_ $vg2 1 1 0 &&
-   vgchange -an $vg1 &&
-   lvremove -f $vg1/$lv2 &&
-   vgremove -ff $vg1 &&
-   vgremove -ff $vg2'
-
-
-test_done
-
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
+COMM "vgsplit fails, active mirror involved in split" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 -m1 $vg1 $dev1 $dev2 $dev3 
+lvcreate -l 16 -n $lv2 $vg1 $dev4 
+lvchange -an $vg1/$lv2 
+vg_validate_pvlv_counts_ $vg1 4 2 0 
+not vgsplit -n $lv1 $vg1 $vg2;
+vg_validate_pvlv_counts_ $vg1 4 2 0 
+vgremove -ff $vg1
+
+COMM "vgsplit succeeds, active mirror not involved in split" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 16 -n $lv1 -m1 $vg1 $dev1 $dev2 $dev3 
+lvcreate -l 16 -n $lv2 $vg1 $dev4 
+lvchange -an $vg1/$lv2 
+vg_validate_pvlv_counts_ $vg1 4 2 0 
+vgsplit -n $lv2 $vg1 $vg2 
+vg_validate_pvlv_counts_ $vg1 3 1 0 
+vg_validate_pvlv_counts_ $vg2 1 1 0 
+vgremove -ff $vg1 
+vgremove -ff $vg2
+
+COMM "vgsplit fails, active snapshot involved in split" 
+vgcreate $vg1 $dev1 $dev2 $dev3 $dev4 
+lvcreate -l 64 -i 2 -n $lv1 $vg1 $dev1 $dev2 
+lvcreate -l 4 -i 2 -s -n $lv2 $vg1/$lv1 
+lvcreate -l 64 -i 2 -n $lv3 $vg1 $dev3 $dev4 
+lvchange -an $vg1/$lv3 
+vg_validate_pvlv_counts_ $vg1 4 3 1 
+not vgsplit -n $lv2 $vg1 $vg2;
+vg_validate_pvlv_counts_ $vg1 4 3 1 
+lvremove -f $vg1/$lv2 
+vgremove -ff $vg1
+
+COMM "vgsplit succeeds, active snapshot not involved in split" 
+vgcreate $vg1 $dev1 $dev2 $dev3 
+lvcreate -l 64 -i 2 -n $lv1 $vg1 $dev1 $dev2 
+lvcreate -l 4 -s -n $lv2 $vg1/$lv1 
+vgextend $vg1 $dev4 
+lvcreate -l 64 -n $lv3 $vg1 $dev4 
+lvchange -an $vg1/$lv3 
+vg_validate_pvlv_counts_ $vg1 4 3 1 
+vgsplit -n $lv3 $vg1 $vg2 
+vg_validate_pvlv_counts_ $vg1 3 2 1 
+vg_validate_pvlv_counts_ $vg2 1 1 0 
+vgchange -an $vg1 
+lvremove -f $vg1/$lv2 
+vgremove -ff $vg1 
+vgremove -ff $vg2
+