From 7aa34a6a1919337a4ea37170d1f49651804180a4 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 19 Sep 2011 13:52:22 +0000 Subject: [PATCH] Enable t-fsadm test Now all commands are executed from preffered directory. --- test/t-fsadm.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/t-fsadm.sh b/test/t-fsadm.sh index a539ccf3d..b9ebe694d 100644 --- a/test/t-fsadm.sh +++ b/test/t-fsadm.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2008-2010 Red Hat, Inc. All rights reserved. +# Copyright (C) 2008-2011 Red Hat, Inc. All rights reserved. # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions @@ -10,7 +10,6 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA test_description='Exercise fsadm filesystem resize' -exit 200 . lib/test @@ -32,6 +31,8 @@ which reiserfsck || check_reiserfs=${check_reiserfs:=reiserfsck} vg_lv="$vg/$lv1" dev_vg_lv="$DM_DEV_DIR/$vg_lv" mount_dir="$TESTDIR/mnt" +# for recursive call +export LVM_BINARY=$(which lvm) test ! -d $mount_dir && mkdir $mount_dir @@ -75,13 +76,13 @@ if check_missing ext3; then fsadm --lvresize resize $vg_lv 30M # Fails - not enough space for 4M fs - not fsadm --lvresize resize $dev_vg_lv 4M + not fsadm -y --lvresize resize $dev_vg_lv 4M lvresize -L+10M -r $vg_lv lvreduce -L10M -r $vg_lv fscheck_ext3 mount $dev_vg_lv $mount_dir - not fsadm --lvresize resize $vg_lv 9M + not fsadm -y --lvresize resize $vg_lv 4M lvresize -L+20M -r -n $vg_lv umount $mount_dir fscheck_ext3 @@ -121,3 +122,5 @@ if check_missing reiserfs; then lvresize -f -L20M $vg_lv fi + +vgremove -ff $vg