shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: no warn if test does not need thin_repair

Browse Source 
Set LVM_TEST_THIN_REPAIR_CMD to /bin/false for test which
doesn't need it.

This way - even if on the system there is no such tool present,
test will not result with warning about missing tool.

Also remove from Makefile settings of TEST vars which are set in
through /lib/paths  - this also allows to override them in test.
This commit is contained in:
Zdenek Kabelac 2015-05-17 17:22:18 +02:00
parent 2fca6cdeb3
commit 76cc477fba
21 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/Makefile.in
View File

@ -26,15 +26,6 @@ abs_top_srcdir = @abs_top_srcdir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
LVM_TEST_RESULTS ?= results LVM_TEST_RESULTS ?= results
export LVM_TEST_THIN_CHECK_CMD?=@THIN_CHECK_CMD@
export LVM_TEST_THIN_DUMP_CMD?=@THIN_DUMP_CMD@
export LVM_TEST_THIN_REPAIR_CMD?=@THIN_REPAIR_CMD@
export LVM_TEST_THIN_RESTORE_CMD?=@THIN_RESTORE_CMD@
export LVM_TEST_CACHE_CHECK_CMD?=@CACHE_CHECK_CMD@
export LVM_TEST_CACHE_DUMP_CMD?=@CACHE_DUMP_CMD@
export LVM_TEST_CACHE_REPAIR_CMD?=@CACHE_REPAIR_CMD@
export LVM_TEST_CACHE_RESTORE_CMD?=@CACHE_RESTORE_CMD@
SUBDIRS = api unit SUBDIRS = api unit
SOURCES = lib/not.c lib/harness.c SOURCES = lib/not.c lib/harness.c

2
test/shell/discards-thin.sh
View File

@ -13,6 +13,8 @@
# test support of thin discards # test support of thin discards
# #
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvchange-thin.sh
View File

@ -9,6 +9,8 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvcreate-thin-big.sh
View File

@ -13,6 +13,8 @@
# test currently needs to drop # test currently needs to drop
# 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using " # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvcreate-thin-external.sh
View File

@ -12,6 +12,8 @@
# Test creation of thin snapshots using external origin # Test creation of thin snapshots using external origin
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvcreate-thin-power2.sh
View File

@ -13,6 +13,8 @@
# test support for non-power-of-2 thin chunk size # test support for non-power-of-2 thin chunk size
# #
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvcreate-thin-snap.sh
View File

@ -10,6 +10,8 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvcreate-thin.sh
View File

@ -13,6 +13,8 @@
# test currently needs to drop # test currently needs to drop
# 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using " # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

3
test/shell/lvextend-thin-metadata-dmeventd.sh
View File

@ -10,6 +10,9 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Test autoextension of thin metadata volume # Test autoextension of thin metadata volume
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvextend-thin.sh
View File

@ -9,6 +9,8 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

3
test/shell/lvresize-thin-external-origin.sh
View File

@ -10,6 +10,9 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Test resize of thin volume with external origin # Test resize of thin volume with external origin
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/lvresize-thin-metadata.sh
View File

@ -9,6 +9,8 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/profiles-thin.sh
View File

@ -13,6 +13,8 @@
# test thin profile functionality # test thin profile functionality
# #
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

4
test/shell/select-tools-thin.sh
View File

@ -9,6 +9,8 @@
# along with this program; if not, write to the Free Software Foundation, # along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip
@ -35,3 +37,5 @@ grep "Logical volume \"thin_orig\" successfully removed" out
grep "Logical volume \"thin_snap\" successfully removed" out grep "Logical volume \"thin_snap\" successfully removed" out
not lvs $vg1/thin_orig not lvs $vg1/thin_orig
not lvs $vg1/thin_snap not lvs $vg1/thin_snap
vgremove -ff $vg1

2
test/shell/thin-autoumount-dmeventd.sh
View File

@ -11,6 +11,8 @@
# no automatic extensions, just umount # no automatic extensions, just umount
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
is_dir_mounted_() is_dir_mounted_()
{ {
cat /proc/mounts | sed 's:\\040: :g' | grep "$1" cat /proc/mounts | sed 's:\\040: :g' | grep "$1"

2
test/shell/thin-defaults.sh
View File

@ -11,6 +11,8 @@
# test defaults entered through lvm.conf # test defaults entered through lvm.conf
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/thin-merge.sh
View File

@ -11,6 +11,8 @@
# test merge of thin snapshot # test merge of thin snapshot
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
MKFS=mkfs.ext2 MKFS=mkfs.ext2

2
test/shell/thin-restore.sh
View File

@ -11,6 +11,8 @@
# test restore operation of thin pool metadata # test restore operation of thin pool metadata
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/thin-vglock.sh
View File

@ -12,6 +12,8 @@
# Test locking works and doesn't update metadata # Test locking works and doesn't update metadata
# RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1063542 # RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1063542
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
MKFS=mkfs.ext2 MKFS=mkfs.ext2

2
test/shell/thin-volume-list.sh
View File

@ -11,6 +11,8 @@
# test pool behaviour when volume_list masks activation # test pool behaviour when volume_list masks activation
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip

2
test/shell/vgsplit-thin.sh
View File

@ -11,6 +11,8 @@
# Test vgsplit command options for validity # Test vgsplit command options for validity
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
. lib/inittest . lib/inittest
test -e LOCAL_LVMPOLLD && skip test -e LOCAL_LVMPOLLD && skip