From 883486cc675d5318d89268aaa3db12dbcc05f3df Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Tue, 14 Oct 2008 19:48:01 +0000 Subject: [PATCH] Re-indent test-utils.sh consistently, using tabs. --- test/test-utils.sh | 132 ++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/test/test-utils.sh b/test/test-utils.sh index cf4b9444e..fc84c2d5e 100644 --- a/test/test-utils.sh +++ b/test/test-utils.sh @@ -12,8 +12,8 @@ test_description="foo" # silence test-lib for now . ./test-lib.sh aux() { - # use just "$@" for verbose operation - "$@" > /dev/null 2> /dev/null + # use just "$@" for verbose operation + "$@" > /dev/null 2> /dev/null #"$@" } @@ -29,37 +29,37 @@ STACKTRACE() { } teardown() { - echo $LOOP - echo $PREFIX - - test -n "$PREFIX" && { - rm -rf /dev/$PREFIX* - while dmsetup table | grep -q ^$PREFIX; do - for s in `dmsetup table | grep ^$PREFIX| cut -f1 -d:`; do - dmsetup resume $s 2>/dev/null > /dev/null || true - dmsetup remove $s 2>/dev/null > /dev/null || true - done - done - } + echo $LOOP + echo $PREFIX + + test -n "$PREFIX" && { + rm -rf /dev/$PREFIX* + while dmsetup table | grep -q ^$PREFIX; do + for s in `dmsetup table | grep ^$PREFIX| cut -f1 -d:`; do + dmsetup resume $s 2>/dev/null > /dev/null || true + dmsetup remove $s 2>/dev/null > /dev/null || true + done + done + } - test -n "$LOOP" && losetup -d $LOOP - test -n "$LOOPFILE" && rm -f $LOOPFILE + test -n "$LOOP" && losetup -d $LOOP + test -n "$LOOPFILE" && rm -f $LOOPFILE - cleanup_ # user-overridable cleanup - testlib_cleanup_ # call test-lib cleanup routine, too + cleanup_ # user-overridable cleanup + testlib_cleanup_ # call test-lib cleanup routine, too } make_ioerror() { - echo 0 10000000 error | dmsetup create ioerror - dmsetup resume ioerror - ln -s /dev/mapper/ioerror /dev/ioerror + echo 0 10000000 error | dmsetup create ioerror + dmsetup resume ioerror + ln -s /dev/mapper/ioerror /dev/ioerror } prepare_loop() { - size=$1 - test -n "$size" || size=32 + size=$1 + test -n "$size" || size=32 - test -n "$LOOP" && return 0 + test -n "$LOOP" && return 0 trap 'aux teardown' EXIT # don't forget to clean up trap 'set +vex; STACKTRACE; set -vex' ERR #trap - ERR @@ -89,68 +89,68 @@ prepare_loop() { } prepare_devs() { - local n="$1" - test -z "$n" && n=3 - local devsize="$2" - test -z "$devsize" && devsize=33 - - prepare_loop $(($n*$devsize)) - - PREFIX="LVMTEST$$" - - local loopsz=`blockdev --getsz $LOOP` - local size=$(($loopsz/$n)) - - for i in `seq 1 $n`; do - local name="${PREFIX}pv$i" - local dev="$G_dev_/mapper/$name" - eval "dev$i=$dev" - devs="$devs $dev" - echo 0 $size linear $LOOP $((($i-1)*$size)) > $name.table - dmsetup create $name $name.table - dmsetup resume $name - done + local n="$1" + test -z "$n" && n=3 + local devsize="$2" + test -z "$devsize" && devsize=33 + + prepare_loop $(($n*$devsize)) + + PREFIX="LVMTEST$$" + + local loopsz=`blockdev --getsz $LOOP` + local size=$(($loopsz/$n)) + + for i in `seq 1 $n`; do + local name="${PREFIX}pv$i" + local dev="$G_dev_/mapper/$name" + eval "dev$i=$dev" + devs="$devs $dev" + echo 0 $size linear $LOOP $((($i-1)*$size)) > $name.table + dmsetup create $name $name.table + dmsetup resume $name + done # set up some default names - vg=${PREFIX}vg - vg1=${PREFIX}vg1 - vg2=${PREFIX}vg2 - lv=LV - lv1=LV1 - lv2=LV2 - lv3=LV3 + vg=${PREFIX}vg + vg1=${PREFIX}vg1 + vg2=${PREFIX}vg2 + lv=LV + lv1=LV1 + lv2=LV2 + lv3=LV3 } disable_dev() { - for dev in "$@"; do + for dev in "$@"; do # first we make the device inaccessible - echo 0 10000000 error | dmsetup load $dev - dmsetup resume $dev + echo 0 10000000 error | dmsetup load $dev + dmsetup resume $dev # now let's try to get rid of it if it's unused #dmsetup remove $dev - done + done } enable_dev() { - for dev in "$@"; do - local name=`echo "$dev" | sed -e 's,.*/,,'` - dmsetup create $name $name.table || dmsetup load $name $name.table - dmsetup resume $dev - done + for dev in "$@"; do + local name=`echo "$dev" | sed -e 's,.*/,,'` + dmsetup create $name $name.table || dmsetup load $name $name.table + dmsetup resume $dev + done } prepare_pvs() { - prepare_devs "$@" - pvcreate $devs + prepare_devs "$@" + pvcreate $devs } prepare_vg() { - prepare_pvs "$@" - vgcreate $vg $devs + prepare_pvs "$@" + vgcreate $vg $devs } prepare_lvmconf() { - cat > $G_root_/etc/lvm.conf <<-EOF + cat > $G_root_/etc/lvm.conf <<-EOF devices { dir = "$G_dev_" scan = "$G_dev_" -- 2.43.5