From 6507ce98df35d12e6b71f9ac71b390c5aee2556b Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 5 Jan 2011 14:15:26 +0000 Subject: [PATCH] Remove obsolete bits of support code from test/. --- test/harness.sh | 50 ----- test/lvm-utils.sh | 153 --------------- test/test-utils.sh | 457 --------------------------------------------- 3 files changed, 660 deletions(-) delete mode 100644 test/harness.sh delete mode 100644 test/lvm-utils.sh delete mode 100644 test/test-utils.sh diff --git a/test/harness.sh b/test/harness.sh deleted file mode 100644 index b4bdd6922..000000000 --- a/test/harness.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# Copyright (C) 2010 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 -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -tests="$@" -test -z "$tests" && tests=`echo t-*.sh` - -for t in $tests; do - printf "Running %-40s" "$t ..." - out=`bash ./$t 2>&1` - ret=$? - if test $ret = 0; then - echo " passed." - elif test $ret = 200; then - skipped="$skipped $t" - echo " skipped." - else - echo " FAILED!" - len=`echo $t | wc -c` - # fancy formatting... - printf -- "--- Output: $t -" - for i in `seq $(($len + 14)) 78`; do echo -n "-"; done; echo - printf "%s\n" "$out" - printf -- "--- End: $t ----" - for i in `seq $(($len + 14)) 78`; do echo -n "-"; done; echo - failed="$failed $t" - fi -done - -if test -n "$failed"; then - echo "Tests skipped:" - for t in $skipped; do - printf "\t%s\n" $t - done - echo "TESTS FAILED:" - for t in $failed; do - printf "\t%s\n" $t - done - exit 1 -else - echo "All tests passed." -fi diff --git a/test/lvm-utils.sh b/test/lvm-utils.sh deleted file mode 100644 index fec4e2cb6..000000000 --- a/test/lvm-utils.sh +++ /dev/null @@ -1,153 +0,0 @@ -# Put lvm-related utilities here. -# This file is sourced from test-lib.sh. - -# Copyright (C) 2007, 2008 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 -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -export LVM_SUPPRESS_FD_WARNINGS=1 - -ME=$(basename "$0") -warn() { echo >&2 "$ME: $@"; } - -trim() -{ - trimmed=${1%% } - trimmed=${trimmed## } - - echo "$trimmed" -} - -compare_two_fields_() -{ - local cmd1=$1; - local obj1=$2; - local field1=$3; - local cmd2=$4; - local obj2=$5; - local field2=$6; - local val1; - local val2; - - val1=$($cmd1 --noheadings -o $field1 $obj1) - val2=$($cmd2 --noheadings -o $field2 $obj2) -if test "$verbose" = "t" -then - echo "compare_two_fields_ $obj1($field1): $val1 $obj2($field2): $val2" -fi - test "$val1" = "$val2" -} - -compare_vg_field_() -{ - local vg1=$1; - local vg2=$2; - local field=$3; - local val1; - local val2; - - val1=$(vgs --noheadings -o $field $vg1) - val2=$(vgs --noheadings -o $field $vg2) -if test "$verbose" = "t" -then - echo "compare_vg_field_ VG1: $val1 VG2: $val2" -fi - test "$val1" = "$val2" -} - - -get_pv_field() { - local pv=$1 - local field=$2 - local value - pvs --noheading -o $field $pv | sed 's/^ *//' -} - -get_vg_field() { - local vg=$1 - local field=$2 - local value - vgs --noheading -o $field $vg | sed 's/^ *//' -} - -get_lv_field() { - local lv=$1 - local field=$2 - local value - lvs --noheading -o $field $lv | sed 's/^ *//' -} - -check_vg_field_() -{ - local vg=$1; - local field=$2; - local expected=$3; - local actual; - - actual=$(trim $(vgs --noheadings -o $field $vg)) -if test "$verbose" = "t" -then - echo "check_vg_field_ VG=$vg, field=$field, actual=$actual, expected=$expected" -fi - test "$actual" = "$expected" -} - -check_pv_field_() -{ - local pv=$1; - local field=$2; - local expected=$3; - local pvs_args=$4; # optional - local actual; - - actual=$(trim $(pvs --noheadings $pvs_args -o $field $pv)) -if test "$verbose" = "t" -then - echo "check_pv_field_ PV=$pv, field=$field, actual=$actual, expected=$expected" -fi - test "$actual" = "$expected" -} - -check_lv_field_() -{ - local lv=$1; - local field=$2; - local expected=$3; - local actual; - - actual=$(trim $(lvs --noheadings -o $field $lv)) -if test "$verbose" = "t" -then - echo "check_lv_field_ LV=$lv, field=$field, actual=$actual, expected=$expected" -fi - test "$actual" = "$expected" -} - -vg_validate_pvlv_counts_() -{ - local local_vg=$1 - local num_pvs=$2 - local num_lvs=$3 - local num_snaps=$4 - - lvs -a -o+devices $local_vg - - check_vg_field_ $local_vg pv_count $num_pvs && \ - check_vg_field_ $local_vg lv_count $num_lvs && \ - check_vg_field_ $local_vg snap_count $num_snaps -} - -dmsetup_has_dm_devdir_support_() -{ - # Detect support for the envvar. If it's supported, the - # following command will fail with the expected diagnostic. - out=$(DM_DEV_DIR=j dmsetup version 2>&1) - test "$?:$out" = "1:Invalid DM_DEV_DIR envvar value." -o \ - "$?:$out" = "1:Invalid DM_DEV_DIR environment variable value." -} diff --git a/test/test-utils.sh b/test/test-utils.sh deleted file mode 100644 index e1aea8af7..000000000 --- a/test/test-utils.sh +++ /dev/null @@ -1,457 +0,0 @@ -# Copyright (C) 2008 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 -# of the GNU General Public License v.2. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -aux() { - # use just "$@" for verbose operation - "$@" > /dev/null 2> /dev/null - #"$@" -} - -STACKTRACE() { - trap - ERR; - i=0; - - while FUNC=${FUNCNAME[$i]}; test "$FUNC" != "main"; do - echo "$i ${FUNC}() called from ${BASH_SOURCE[$i]}:${BASH_LINENO[$i]}" - i=$(($i + 1)); - done - - # Get backtraces from coredumps - if which gdb >& /dev/null; then - echo bt full > gdb_commands.txt - echo l >> gdb_commands.txt - echo quit >> gdb_commands.txt - for core in `ls core* 2>/dev/null`; do - bin=$(gdb -batch -c $core 2>&1 | grep "generated by" | \ - sed -e "s,.*generated by \`\([^ ']*\).*,\1,") - gdb -batch -c $core -x gdb_commands.txt `which $bin` - done - fi - - test -f debug.log && { - sed -e "s,^,## DEBUG: ,;s,$top_srcdir/\?,," < debug.log - } -} - -init_udev_transaction() { - if test "$DM_UDEV_SYNCHRONISATION" = 1; then - COOKIE=$(dmsetup udevcreatecookie) - # Cookie is not generated if udev is not running! - if test -n "$COOKIE"; then - export DM_UDEV_COOKIE=$COOKIE - fi - fi -} - -finish_udev_transaction() { - if test "$DM_UDEV_SYNCHRONISATION" = 1 -a -n "$DM_UDEV_COOKIE"; then - dmsetup udevreleasecookie - unset DM_UDEV_COOKIE - fi -} - -prepare_clvmd() { - if test -z "$LVM_TEST_LOCKING" || test "$LVM_TEST_LOCKING" -ne 3 ; then - return 0 # not needed - fi - - if pgrep clvmd ; then - echo "Cannot use fake cluster locking with real clvmd ($(pgrep clvmd)) running." - exit 200 - fi - - # skip if we don't have our own clvmd... - (which clvmd | grep $abs_builddir) || exit 200 - - # skip if we singlenode is not compiled in - (clvmd --help 2>&1 | grep "Available cluster managers" | grep singlenode) || exit 200 - - trap_teardown - - clvmd -Isinglenode -d 1 & - LOCAL_CLVMD="$!" - - # check that it is really running now - sleep .1 - ps $LOCAL_CLVMD || exit 200 -} - -prepare_dmeventd() { - if pgrep dmeventd ; then - echo "Cannot test dmeventd with real dmeventd ($(pgrep dmeventd)) running." - exit 200 - fi - - # skip if we don't have our own dmeventd... - (which dmeventd | grep $abs_builddir) || exit 200 - - trap_teardown - - dmeventd -f & - LOCAL_DMEVENTD="$!" -} - -prepare_testroot() { - OLDPWD="`pwd`" - PREFIX="LVMTEST$$" - - trap_teardown - TESTDIR=$($abs_srcdir/mkdtemp ${LVM_TEST_DIR-$(pwd)} $PREFIX.XXXXXXXXXX) \ - || { echo "failed to create temporary directory in ${LVM_TEST_DIR-$(pwd)}"; exit 1; } - - export LVM_SYSTEM_DIR=$TESTDIR/etc - export DM_DEV_DIR=$TESTDIR/dev - mkdir $LVM_SYSTEM_DIR $DM_DEV_DIR $DM_DEV_DIR/mapper $TESTDIR/lib - - cd $TESTDIR - - for i in `find $abs_top_builddir/daemons/dmeventd/plugins/ -name \*.so`; do - echo Setting up symlink from $i to $TESTDIR/lib - ln -s $i $TESTDIR/lib - done -} - -teardown_devs() { - test -n "$PREFIX" && { - rm -rf $TESTDIR/dev/$PREFIX* - - init_udev_transaction - while dmsetup table | grep -q ^$PREFIX; do - for s in `dmsetup info -c -o name --noheading | grep ^$PREFIX`; do - umount -fl $DM_DEV_DIR/mapper/$s || true - dmsetup remove $s >& /dev/null || true - done - done - finish_udev_transaction - - } - - # NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because - # prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop() - if [ -n "$SCSI_DEBUG_DEV" ] ; then - modprobe -r scsi_debug - else - test -n "$LOOP" && losetup -d $LOOP - test -n "$LOOPFILE" && rm -f $LOOPFILE - fi - unset devs # devs is set in prepare_devs() - unset LOOP -} - -teardown() { - echo $LOOP - echo $PREFIX - - test -n "$LOCAL_CLVMD" && { - kill "$LOCAL_CLVMD" - sleep .1 - kill -9 "$LOCAL_CLVMD" || true - } - - test -n "$LOCAL_DMEVENTD" && kill -9 "$LOCAL_DMEVENTD" - - teardown_devs - - test -n "$TESTDIR" && { - cd $OLDPWD - rm -rf $TESTDIR || echo BLA - } -} - -trap_teardown() { - trap 'set +vx; STACKTRACE; set -vx' ERR - trap 'aux teardown' EXIT # don't forget to clean up -} - -make_ioerror() { - echo 0 10000000 error | dmsetup create ioerror - ln -s $DM_DEV_DIR/mapper/ioerror $DM_DEV_DIR/ioerror -} - -prepare_loop() { - size=$1 - test -n "$size" || size=32 - - # skip if prepare_scsi_debug_dev() was used - if [ -n "$SCSI_DEBUG_DEV" -a -n "$LOOP" ]; then - return 0 - fi - - test -z "$LOOP" - test -n "$DM_DEV_DIR" - - trap_teardown - - for i in 0 1 2 3 4 5 6 7; do - test -e $DM_DEV_DIR/loop$i || mknod $DM_DEV_DIR/loop$i b 7 $i - done - - LOOPFILE="$PWD/test.img" - dd if=/dev/zero of="$LOOPFILE" bs=$((1024*1024)) count=0 seek=$(($size-1)) - if LOOP=`losetup -s -f "$LOOPFILE" 2>/dev/null`; then - return 0 - elif LOOP=`losetup -f` && losetup $LOOP "$LOOPFILE"; then - # no -s support - return 0 - else - # no -f support - # Iterate through $DM_DEV_DIR/loop{,/}{0,1,2,3,4,5,6,7} - for slash in '' /; do - for i in 0 1 2 3 4 5 6 7; do - local dev=$DM_DEV_DIR/loop$slash$i - ! losetup $dev >/dev/null 2>&1 || continue - # got a free - losetup "$dev" "$LOOPFILE" - LOOP=$dev - break - done - if [ -n "$LOOP" ]; then - break - fi - done - test -n "$LOOP" # confirm or fail - return 0 - fi - exit 1 # should not happen -} - -# A drop-in replacement for prepare_loop() that uses scsi_debug to create -# a ramdisk-based SCSI device upon which all LVM devices will be created -# - scripts must take care not to use a DEV_SIZE that will enduce OOM-killer -prepare_scsi_debug_dev() -{ - local DEV_SIZE="$1" - shift - local SCSI_DEBUG_PARAMS="$@" - - test -n "$SCSI_DEBUG_DEV" && return 0 - test -z "$LOOP" - test -n "$DM_DEV_DIR" - - trap_teardown - - # Skip test if awk isn't available (required for get_sd_devs_) - which awk || exit 200 - - # Skip test if scsi_debug module is unavailable or is already in use - modprobe --dry-run scsi_debug || exit 200 - lsmod | grep -q scsi_debug && exit 200 - - # Create the scsi_debug device and determine the new scsi device's name - # NOTE: it will _never_ make sense to pass num_tgts param; - # last param wins.. so num_tgts=1 is imposed - modprobe scsi_debug dev_size_mb=$DEV_SIZE $SCSI_DEBUG_PARAMS num_tgts=1 || exit 200 - sleep 2 # allow for async Linux SCSI device registration - - local DEBUG_DEV=/dev/$(grep -H scsi_debug /sys/block/*/device/model | cut -f4 -d /) - [ -b $DEBUG_DEV ] || exit 1 # should not happen - - # Create symlink to scsi_debug device in $DM_DEV_DIR - SCSI_DEBUG_DEV=$DM_DEV_DIR/$(basename $DEBUG_DEV) - # Setting $LOOP provides means for prepare_devs() override - LOOP=$SCSI_DEBUG_DEV - ln -snf $DEBUG_DEV $SCSI_DEBUG_DEV - return 0 -} - -cleanup_scsi_debug_dev() -{ - aux teardown_devs - unset SCSI_DEBUG_DEV - unset LOOP -} - -prepare_devs() { - local n="$1" - test -z "$n" && n=3 - local devsize="$2" - test -z "$devsize" && devsize=34 - local pvname="$3" - test -z "$pvname" && pvname="pv" - - prepare_loop $(($n*$devsize)) - - if ! loopsz=`blockdev --getsz $LOOP 2>/dev/null`; then - loopsz=`blockdev --getsize $LOOP 2>/dev/null` - fi - - local size=$(($loopsz/$n)) - - init_udev_transaction - for i in `seq 1 $n`; do - local name="${PREFIX}$pvname$i" - local dev="$DM_DEV_DIR/mapper/$name" - eval "dev$i=$dev" - devs="$devs $dev" - echo 0 $size linear $LOOP $((($i-1)*$size)) > $name.table - dmsetup create $name $name.table - done - finish_udev_transaction - - for i in `seq 1 $n`; do - local name="${PREFIX}$pvname$i" - dmsetup info -c $name - done - for i in `seq 1 $n`; do - local name="${PREFIX}$pvname$i" - dmsetup table $name - done -} - -disable_dev() { - - init_udev_transaction - for dev in "$@"; do - # first we make the device inaccessible - 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 - finish_udev_transaction - -} - -enable_dev() { - - init_udev_transaction - 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 - finish_udev_transaction -} - -backup_dev() { - for dev in "$@"; do - dd if=$dev of=$dev.backup bs=1024 - done -} - -restore_dev() { - for dev in "$@"; do - test -e $dev.backup || { - echo "Internal error: $dev not backed up, can't restore!" - exit 1 - } - dd of=$dev if=$dev.backup bs=1024 - done -} - -prepare_pvs() { - prepare_devs "$@" - pvcreate -ff $devs -} - -prepare_vg() { - vgremove -ff $vg || true - teardown_devs - - prepare_pvs "$@" - vgcreate -c n $vg $devs - pvs -v -} - -prepare_lvmconf() { - local filter="$1" - test -z "$filter" && \ - filter='[ "a/dev\/mirror/", "a/dev\/mapper\/.*pv[0-9_]*$/", "r/.*/" ]' - locktype= - if test -z "$LVM_TEST_CONFIG_SNAPSHOT_AUTOEXTEND"; then - LVM_TEST_CONFIG_SNAPSHOT_AUTOEXTEND=" - snapshot_autoextend_percent = 50 - snapshot_autoextend_threshold = 50" - fi - if test -n "$LVM_TEST_LOCKING"; then locktype="locking_type = $LVM_TEST_LOCKING"; fi - cat > $TESTDIR/etc/lvm.conf.new <<-EOF - $LVM_TEST_CONFIG - devices { - dir = "$DM_DEV_DIR" - scan = "$DM_DEV_DIR" - filter = $filter - cache_dir = "$TESTDIR/etc" - sysfs_scan = 0 - default_data_alignment = 1 - $LVM_TEST_CONFIG_DEVICES - } - log { - syslog = 0 - indent = 1 - level = 9 - file = "$TESTDIR/debug.log" - overwrite = 1 - activation = 1 - } - backup { - backup = 0 - archive = 0 - } - global { - abort_on_internal_errors = 1 - library_dir = "$TESTDIR/lib" - locking_dir = "$TESTDIR/var/lock/lvm" - $locktype - si_unit_consistency = 1 - fallback_to_local_locking = 0 - } - activation { - udev_sync = 1 - udev_rules = 1 - polling_interval = 0 - $LVM_TEST_CONFIG_SNAPSHOT_AUTOEXTEND - } -EOF - # FIXME remove this workaround after mmap & truncating file problems solved - mv -f $TESTDIR/etc/lvm.conf.new $TESTDIR/etc/lvm.conf - cat $TESTDIR/etc/lvm.conf -} - -prepare() { - ulimit -c unlimited - # FIXME any way to set this just for our children? - # echo 1 > /proc/sys/kernel/core_uses_pid - prepare_testroot - prepare_lvmconf - prepare_clvmd - - # set up some default names - vg=${PREFIX}vg - vg1=${PREFIX}vg1 - vg2=${PREFIX}vg2 - lv=LV - lv1=LV1 - lv2=LV2 - lv3=LV3 - lv4=LV4 -} - -apitest() { - t=$1 - shift - test -x $abs_top_builddir/test/api/$t.t || exit 200 - $abs_top_builddir/test/api/$t.t "$@" -} - -api() { - test -x $abs_top_builddir/test/api/wrapper || exit 200 - $abs_top_builddir/test/api/wrapper "$@" -} - -LANG=C -LC_ALL=C -TZ=UTC -unset CDPATH - -. ./init.sh || { echo >&2 you must run make first; exit 1; } -. ./lvm-utils.sh - -set -vexE -o pipefail -aux prepare -- 2.43.5