From: mornfall@sourceware.org <mornfall@sourceware.org>
To: lvm-devel@redhat.com
Subject: LVM2/test test-utils.sh
Date: 14 Oct 2008 19:48:02 -0000 [thread overview]
Message-ID: <20081014194802.30218.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall at sourceware.org 2008-10-14 19:48:02
Modified files:
test : test-utils.sh
Log message:
Re-indent test-utils.sh consistently, using tabs.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/test-utils.sh.diff?cvsroot=lvm2&r1=1.3&r2=1.4
--- LVM2/test/test-utils.sh 2008/10/06 16:55:30 1.3
+++ LVM2/test/test-utils.sh 2008/10/14 19:48:01 1.4
@@ -12,8 +12,8 @@
. ./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 @@
}
teardown() {
- echo $LOOP
- echo $PREFIX
+ 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 "$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_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_"
next reply other threads:[~2008-10-14 19:48 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 19:48 mornfall [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-04 14:38 LVM2/test test-utils.sh mornfall
2008-11-10 12:36 mornfall
2008-12-05 5:03 wysochanski
2008-12-10 16:16 zkabelac
2009-04-24 8:00 mornfall
2009-05-13 19:18 wysochanski
2010-02-01 19:43 wysochanski
2010-03-18 9:27 mornfall
2010-03-28 15:52 mornfall
2010-04-06 14:25 agk
2010-04-07 16:04 mornfall
2010-04-07 21:19 mornfall
2010-04-07 21:38 mornfall
2010-04-13 6:24 mornfall
2010-04-13 7:02 mornfall
2010-04-13 8:01 mornfall
2010-04-14 12:04 mornfall
2010-04-20 18:18 snitzer
2010-05-12 11:58 mornfall
2010-05-24 17:18 mbroz
2010-05-24 17:19 mbroz
2010-08-02 13:18 zkabelac
2010-08-27 7:59 mbroz
2010-08-27 8:52 mbroz
2010-10-12 16:13 mornfall
2010-10-26 1:25 snitzer
2010-12-09 11:19 mbroz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081014194802.30218.qmail@sourceware.org \
--to=mornfall@sourceware.org \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.