mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-08 08:58:50 +03:00
tests: simplify some var settings
scan_lvs now automatically comes with extend_filter_LVMTEST
This commit is contained in:
parent
05c7e09e71
commit
e653f43732
@ -1164,7 +1164,7 @@ devices/default_data_alignment = 1
|
||||
devices/dir = "$DM_DEV_DIR"
|
||||
devices/filter = "a|.*|"
|
||||
devices/global_filter = [ "a|$DM_DEV_DIR/mapper/${PREFIX}.*pv[0-9_]*$|", "r|.*|" ]
|
||||
devices/md_component_detection = 0
|
||||
devices/md_component_detection = 0
|
||||
devices/scan = "$DM_DEV_DIR"
|
||||
devices/sysfs_scan = 1
|
||||
devices/write_cache_state = 0
|
||||
|
@ -25,8 +25,6 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
#
|
||||
aux have_thin 1 1 0 || skip
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux prepare_vg 2 64
|
||||
get_devs
|
||||
|
||||
|
@ -17,8 +17,6 @@ export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
prepare_lvs() {
|
||||
lvremove -f $vg
|
||||
lvcreate -L10M -n $lv1 $vg
|
||||
|
@ -20,7 +20,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
# FIXME update test to make something useful on <16T
|
||||
aux can_use_16T || skip
|
||||
aux have_raid 1 3 0 || skip
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux prepare_vg 5
|
||||
|
||||
|
@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
# FIXME update test to make something useful on <16T
|
||||
aux can_use_16T || skip
|
||||
|
||||
|
@ -22,8 +22,7 @@ test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
|
||||
modprobe raid0 || skip
|
||||
|
||||
aux lvmconf 'devices/md_component_detection = 1'
|
||||
aux extend_filter_LVMTEST
|
||||
aux extend_filter "a|/dev/md.*|"
|
||||
aux extend_filter_LVMTEST "a|/dev/md|"
|
||||
|
||||
aux prepare_devs 2
|
||||
|
||||
|
@ -15,8 +15,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux prepare_vg 4
|
||||
|
||||
lvcreate --type snapshot -s -L10 -n $lv1 $vg --virtualsize 2T
|
||||
|
@ -18,8 +18,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux prepare_vg
|
||||
|
||||
aux have_thin 1 8 0 || skip
|
||||
|
@ -15,10 +15,9 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
# Sets 'scan_lvs = 1'
|
||||
aux extend_filter_LVMTEST
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux prepare_pvs 1
|
||||
|
||||
vgcreate $SHARED $vg1 "$dev1"
|
||||
@ -44,4 +43,3 @@ lvchange -an "$vg1/$lv1"
|
||||
lvremove "$vg1/$lv1"
|
||||
|
||||
vgremove $vg1
|
||||
|
||||
|
@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
which mkfs.ext2 || skip
|
||||
|
||||
aux prepare_vg 5
|
||||
|
@ -18,8 +18,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux can_use_16T || skip
|
||||
|
||||
aux prepare_pvs 1
|
||||
|
@ -17,8 +17,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
MKFS=mkfs.ext2
|
||||
which $MKFS || skip
|
||||
|
||||
|
@ -15,8 +15,6 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
aux lvmconf 'devices/scan_lvs = 1'
|
||||
|
||||
aux extend_filter_LVMTEST
|
||||
aux prepare_pvs 3
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user