mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
tests: no warn if test does not need thin_repair
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:
parent
2fca6cdeb3
commit
76cc477fba
@ -26,15 +26,6 @@ abs_top_srcdir = @abs_top_srcdir@
|
||||
datarootdir = @datarootdir@
|
||||
|
||||
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
|
||||
SOURCES = lib/not.c lib/harness.c
|
||||
|
@ -13,6 +13,8 @@
|
||||
# test support of thin discards
|
||||
#
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -9,6 +9,8 @@
|
||||
# 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_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -13,6 +13,8 @@
|
||||
# test currently needs to drop
|
||||
# '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
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -12,6 +12,8 @@
|
||||
|
||||
# Test creation of thin snapshots using external origin
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -13,6 +13,8 @@
|
||||
# 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
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -10,6 +10,8 @@
|
||||
# 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_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -13,6 +13,8 @@
|
||||
# test currently needs to drop
|
||||
# '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
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -10,6 +10,9 @@
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
# Test autoextension of thin metadata volume
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -9,6 +9,8 @@
|
||||
# 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_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -10,6 +10,9 @@
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
# Test resize of thin volume with external origin
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -9,6 +9,8 @@
|
||||
# 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_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -13,6 +13,8 @@
|
||||
# test thin profile functionality
|
||||
#
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -9,6 +9,8 @@
|
||||
# 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_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
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
|
||||
not lvs $vg1/thin_orig
|
||||
not lvs $vg1/thin_snap
|
||||
|
||||
vgremove -ff $vg1
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# no automatic extensions, just umount
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
is_dir_mounted_()
|
||||
{
|
||||
cat /proc/mounts | sed 's:\\040: :g' | grep "$1"
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# test defaults entered through lvm.conf
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# test merge of thin snapshot
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
MKFS=mkfs.ext2
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# test restore operation of thin pool metadata
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -12,6 +12,8 @@
|
||||
# Test locking works and doesn't update metadata
|
||||
# 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
|
||||
|
||||
MKFS=mkfs.ext2
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# test pool behaviour when volume_list masks activation
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
@ -11,6 +11,8 @@
|
||||
|
||||
# Test vgsplit command options for validity
|
||||
|
||||
export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
Loading…
Reference in New Issue
Block a user