shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

tests: use skip flags

Browse Source 
corrected usage of skip flags.
This commit is contained in:
Zdenek Kabelac 2015-10-27 00:45:37 +01:00
parent a2dd1f6e19
commit 3b5939bbbb
24 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/shell/activate-minor.sh
View File

@ -9,12 +9,13 @@
# 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
SKIP_WITH_LVMPOLLD=1
. lib/inittest . lib/inittest
# Just skip this test if minor is already in use... # Just skip this test if minor is already in use...
dmsetup info | tee info dmsetup info | tee info
egrep "^Major, minor: *[0-9]+, 123" info && skip egrep "^Major, minor: *[0-9]+, 123" info && skip
test -e LOCAL_LVMPOLLD && skip
aux prepare_vg 2 aux prepare_vg 2
lvcreate -a n --zero n -l 1 -n foo $vg lvcreate -a n --zero n -l 1 -n foo $vg

4
test/shell/activate-missing-segment.sh
View File

@ -16,9 +16,9 @@
# instead lvconvert --repair them?) # instead lvconvert --repair them?)
# - linear LVs with bits missing are not activated # - 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 aux prepare_vg 2

4
test/shell/activate-missing.sh
View File

@ -16,9 +16,9 @@
# instead lvconvert --repair them?) # instead lvconvert --repair them?)
# - linear LVs with bits missing are not activated # - 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 aux prepare_vg 4

4
test/shell/activate-partial.sh
View File

@ -9,9 +9,9 @@
# 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
. lib/inittest SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMPOLLD && skip . lib/inittest
aux prepare_vg 3 aux prepare_vg 3

4
test/shell/activation-skip.sh
View File

@ -9,9 +9,9 @@
# 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
. lib/inittest SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMPOLLD && skip . lib/inittest
# Test skip activation flag -k|--setactivationskip # Test skip activation flag -k|--setactivationskip

5
test/shell/clvmd-restart.sh
View File

@ -13,11 +13,12 @@
export LVM_CLVMD_BINARY=clvmd export LVM_CLVMD_BINARY=clvmd
export LVM_BINARY=lvm export LVM_BINARY=lvm
SKIP_WITHOUT_CLVMD=1
SKIP_WITH_LVMPOLLD=1
. lib/inittest . lib/inittest
# only clvmd based test, skip otherwise # only clvmd based test, skip otherwise
test -e LOCAL_LVMPOLLD && skip
test -e LOCAL_CLVMD || skip
read LOCAL_CLVMD < LOCAL_CLVMD read LOCAL_CLVMD < LOCAL_CLVMD
# TODO read from build, for now hardcoded # TODO read from build, for now hardcoded

6
test/shell/lvmetad-ambiguous.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

6
test/shell/lvmetad-autoshutdown.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
kill -0 $(< LOCAL_LVMETAD) || die "lvmetad is already dead" kill -0 $(< LOCAL_LVMETAD) || die "lvmetad is already dead"

6
test/shell/lvmetad-client-filter.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

6
test/shell/lvmetad-disabled.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
kill $(< LOCAL_LVMETAD) kill $(< LOCAL_LVMETAD)
while test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket close while test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket close

6
test/shell/lvmetad-dump.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2
vgcreate $vg1 "$dev1" "$dev2" vgcreate $vg1 "$dev1" "$dev2"

6
test/shell/lvmetad-lvm1.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_devs 2 aux prepare_devs 2
pvcreate --metadatatype 1 "$dev1" pvcreate --metadatatype 1 "$dev1"

6
test/shell/lvmetad-lvscan-cache.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

3
test/shell/lvmetad-no-cluster.sh
View File

@ -9,6 +9,9 @@
# 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
SKIP_WITHOUT_CLVMD=1
SKIP_WITH_LVMPOLLD=1
. lib/inittest . lib/inittest
test -e LOCAL_CLVMD || skip test -e LOCAL_CLVMD || skip

6
test/shell/lvmetad-override.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

4
test/shell/lvmetad-pvs.sh
View File

@ -9,9 +9,9 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMPOLLD=1
test -e LOCAL_LVMPOLLD && skip . lib/inittest
aux prepare_pvs 1 20000 aux prepare_pvs 1 20000
pvs $(cat DEVICES) | grep "$dev1" pvs $(cat DEVICES) | grep "$dev1"

6
test/shell/lvmetad-pvscan-cache.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

6
test/shell/lvmetad-pvscan-filter.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

6
test/shell/lvmetad-pvscan-md.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
modprobe raid0 || skip modprobe raid0 || skip

6
test/shell/lvmetad-pvscan-nomda-bg.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
kill $(< LOCAL_LVMETAD) kill $(< LOCAL_LVMETAD)
rm LOCAL_LVMETAD rm LOCAL_LVMETAD

6
test/shell/lvmetad-pvscan-nomda.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
kill $(< LOCAL_LVMETAD) kill $(< LOCAL_LVMETAD)
rm LOCAL_LVMETAD rm LOCAL_LVMETAD

6
test/shell/lvmetad-restart.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2

4
test/shell/lvmetad-test.sh
View File

@ -9,9 +9,9 @@
# 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
. lib/inittest SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMPOLLD && skip . lib/inittest
aux prepare_pvs 2 aux prepare_pvs 2

6
test/shell/lvmetad-warning.sh
View File

@ -9,10 +9,10 @@
# 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
. lib/inittest SKIP_WITHOUT_LVMETAD=1
SKIP_WITH_LVMPOLLD=1
test -e LOCAL_LVMETAD || skip . lib/inittest
test -e LOCAL_LVMPOLLD && skip
aux prepare_pvs 2 aux prepare_pvs 2