mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
tests: use skip flags
corrected usage of skip flags.
This commit is contained in:
parent
a2dd1f6e19
commit
3b5939bbbb
@ -9,12 +9,13 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
# Just skip this test if minor is already in use...
|
||||
dmsetup info | tee info
|
||||
egrep "^Major, minor: *[0-9]+, 123" info && skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
|
||||
aux prepare_vg 2
|
||||
lvcreate -a n --zero n -l 1 -n foo $vg
|
||||
|
@ -16,9 +16,9 @@
|
||||
# instead lvconvert --repair them?)
|
||||
# - linear LVs with bits missing are not activated
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_vg 2
|
||||
|
||||
|
@ -16,9 +16,9 @@
|
||||
# instead lvconvert --repair them?)
|
||||
# - linear LVs with bits missing are not activated
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_vg 4
|
||||
|
||||
|
@ -9,9 +9,9 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_vg 3
|
||||
|
||||
|
@ -9,9 +9,9 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
# Test skip activation flag -k|--setactivationskip
|
||||
|
||||
|
@ -13,11 +13,12 @@
|
||||
export LVM_CLVMD_BINARY=clvmd
|
||||
export LVM_BINARY=lvm
|
||||
|
||||
SKIP_WITHOUT_CLVMD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
# only clvmd based test, skip otherwise
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
test -e LOCAL_CLVMD || skip
|
||||
read LOCAL_CLVMD < LOCAL_CLVMD
|
||||
|
||||
# TODO read from build, for now hardcoded
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
kill -0 $(< LOCAL_LVMETAD) || die "lvmetad is already dead"
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
kill $(< LOCAL_LVMETAD)
|
||||
while test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket close
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
vgcreate $vg1 "$dev1" "$dev2"
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_devs 2
|
||||
pvcreate --metadatatype 1 "$dev1"
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,6 +9,9 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
SKIP_WITHOUT_CLVMD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
test -e LOCAL_CLVMD || skip
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,9 +9,9 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 1 20000
|
||||
pvs $(cat DEVICES) | grep "$dev1"
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
|
||||
modprobe raid0 || skip
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
kill $(< LOCAL_LVMETAD)
|
||||
rm LOCAL_LVMETAD
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
kill $(< LOCAL_LVMETAD)
|
||||
rm LOCAL_LVMETAD
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,9 +9,9 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
@ -9,10 +9,10 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
. lib/inittest
|
||||
SKIP_WITHOUT_LVMETAD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
test -e LOCAL_LVMETAD || skip
|
||||
test -e LOCAL_LVMPOLLD && skip
|
||||
. lib/inittest
|
||||
|
||||
aux prepare_pvs 2
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user