tests: use skip flags

corrected usage of skip flags.

diff --git a/test/shell/activate-minor.sh b/test/shell/activate-minor.sh
index d7ae5f90d39697c2bcc1a0b2a4d804a72b8d1fae..086a1cafae7617a3565d69014d8ce5496fbbf9ec 100644 (file)
--- a/test/shell/activate-minor.sh
+++ b/test/shell/activate-minor.sh
@@ -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

diff --git a/test/shell/activate-missing-segment.sh b/test/shell/activate-missing-segment.sh
index 988c9cbb82c9530fc2ac780c2fc90b9608d4e5d8..05d6a366a065742c376cf9ea096ed3f576cd566b 100644 (file)
--- a/test/shell/activate-missing-segment.sh
+++ b/test/shell/activate-missing-segment.sh
@@ -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
 

diff --git a/test/shell/activate-missing.sh b/test/shell/activate-missing.sh
index e33a6ef6c7124390621c3fd95dc81207ff430e45..3078b9ddc8d1302a4292dbce4a94cd9c8b7013dc 100644 (file)
--- a/test/shell/activate-missing.sh
+++ b/test/shell/activate-missing.sh
@@ -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
 

diff --git a/test/shell/activate-partial.sh b/test/shell/activate-partial.sh
index 3720e1d266872950a7308e7addea021a9e6e8fec..75a66e2308e1e22f43f4d17f3db3aa236f6378e4 100644 (file)
--- a/test/shell/activate-partial.sh
+++ b/test/shell/activate-partial.sh
@@ -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
 

diff --git a/test/shell/activation-skip.sh b/test/shell/activation-skip.sh
index 5259d9dfd4903f8a4566f8dbd5635bf5b4bb7b4f..18bb2185c6d65ea649408106b91c689708026da1 100644 (file)
--- a/test/shell/activation-skip.sh
+++ b/test/shell/activation-skip.sh
@@ -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
 

diff --git a/test/shell/clvmd-restart.sh b/test/shell/clvmd-restart.sh
index afe48346ca3f9d76805e9d8e3b158d26ba4e4b83..5d8525f603064a829e320a640130cfd3698d2da8 100644 (file)
--- a/test/shell/clvmd-restart.sh
+++ b/test/shell/clvmd-restart.sh
@@ -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

diff --git a/test/shell/lvmetad-ambiguous.sh b/test/shell/lvmetad-ambiguous.sh
index 777a63e8393f82d967ef8a15c6e496c15d199573..1711f717c0fa3f4d705d220cb9efea6049244b53 100644 (file)
--- a/test/shell/lvmetad-ambiguous.sh
+++ b/test/shell/lvmetad-ambiguous.sh
@@ -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
 

diff --git a/test/shell/lvmetad-autoshutdown.sh b/test/shell/lvmetad-autoshutdown.sh
index fdee4a6f8f288fa5ab79f584f83582c186252024..425ee336c6bc1c80f0afa5aca870940e83d1ea4b 100644 (file)
--- a/test/shell/lvmetad-autoshutdown.sh
+++ b/test/shell/lvmetad-autoshutdown.sh
@@ -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"
 

diff --git a/test/shell/lvmetad-client-filter.sh b/test/shell/lvmetad-client-filter.sh
index 5e6d967cf51a9d9618b0cf9c7b9be5c7861c5dd6..4119e641e02ca56ca4eea0dbf00017a38005b9bb 100644 (file)
--- a/test/shell/lvmetad-client-filter.sh
+++ b/test/shell/lvmetad-client-filter.sh
@@ -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
 

diff --git a/test/shell/lvmetad-disabled.sh b/test/shell/lvmetad-disabled.sh
index 9c71717a305efe4c77b2be1542c29fc39de781b2..4f1516552ca7c1193c1a02e4be364b496a64b64e 100644 (file)
--- a/test/shell/lvmetad-disabled.sh
+++ b/test/shell/lvmetad-disabled.sh
@@ -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

diff --git a/test/shell/lvmetad-dump.sh b/test/shell/lvmetad-dump.sh
index 631636ea68312358cee3c0ac739afe77dd449340..c9a7736bde7b3315e685bfc8dc7acf7735c94ec6 100644 (file)
--- a/test/shell/lvmetad-dump.sh
+++ b/test/shell/lvmetad-dump.sh
@@ -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"

diff --git a/test/shell/lvmetad-lvm1.sh b/test/shell/lvmetad-lvm1.sh
index f234b154ce84430a76ee2f0b571413c0437a30ef..3b14fdd89bd15bf3bb340a82a6f2cfc74582ed15 100644 (file)
--- a/test/shell/lvmetad-lvm1.sh
+++ b/test/shell/lvmetad-lvm1.sh
@@ -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"

diff --git a/test/shell/lvmetad-lvscan-cache.sh b/test/shell/lvmetad-lvscan-cache.sh
index 220e464c77b031d9e2345ab85f1c89c8f4cd907e..a4a09823764bd75bed1fddcdd7b79e01a4cf5b34 100644 (file)
--- a/test/shell/lvmetad-lvscan-cache.sh
+++ b/test/shell/lvmetad-lvscan-cache.sh
@@ -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
 

diff --git a/test/shell/lvmetad-no-cluster.sh b/test/shell/lvmetad-no-cluster.sh
index 83fee47fd5cb13e29c20248710c17cff51ae62a4..0421c59b428d1ccd6ea35e4beae7b3c4094b90ce 100644 (file)
--- a/test/shell/lvmetad-no-cluster.sh
+++ b/test/shell/lvmetad-no-cluster.sh
@@ -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

diff --git a/test/shell/lvmetad-override.sh b/test/shell/lvmetad-override.sh
index 15ada7b01ec71235d4ac6dc8cba1fbfc192ce032..a0a983b1b954023b8151ce21b4a29f62d7daa664 100644 (file)
--- a/test/shell/lvmetad-override.sh
+++ b/test/shell/lvmetad-override.sh
@@ -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
 

diff --git a/test/shell/lvmetad-pvs.sh b/test/shell/lvmetad-pvs.sh
index 81174f4cd5ee19157f0336a3995f408b125bc728..3014a67d641415ef19a300fa30a67be3519028e5 100644 (file)
--- a/test/shell/lvmetad-pvs.sh
+++ b/test/shell/lvmetad-pvs.sh
@@ -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"

diff --git a/test/shell/lvmetad-pvscan-cache.sh b/test/shell/lvmetad-pvscan-cache.sh
index 33b4d942c33c2d0f459babd96b0a8469c082ec53..f2a3afa0e037698d626ba56b56fc8b0e30e3cd04 100644 (file)
--- a/test/shell/lvmetad-pvscan-cache.sh
+++ b/test/shell/lvmetad-pvscan-cache.sh
@@ -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
 

diff --git a/test/shell/lvmetad-pvscan-filter.sh b/test/shell/lvmetad-pvscan-filter.sh
index b7bdf339b825afbb44167a1e71d90b7e6db7db91..8ec31edf899a8df7dc9632c27eba96893c25b290 100644 (file)
--- a/test/shell/lvmetad-pvscan-filter.sh
+++ b/test/shell/lvmetad-pvscan-filter.sh
@@ -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
 

diff --git a/test/shell/lvmetad-pvscan-md.sh b/test/shell/lvmetad-pvscan-md.sh
index 9c5e3fa5890447a97b32b84b0bbec61969faa55a..82831e54ef307bcea533cb301b8db5316eed062a 100644 (file)
--- a/test/shell/lvmetad-pvscan-md.sh
+++ b/test/shell/lvmetad-pvscan-md.sh
@@ -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

diff --git a/test/shell/lvmetad-pvscan-nomda-bg.sh b/test/shell/lvmetad-pvscan-nomda-bg.sh
index e17dfd27b3bde4dddee2c862d4d77f027bcd8fdc..5cf460224abc750b39b97271608b15c2ba57d47a 100644 (file)
--- a/test/shell/lvmetad-pvscan-nomda-bg.sh
+++ b/test/shell/lvmetad-pvscan-nomda-bg.sh
@@ -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

diff --git a/test/shell/lvmetad-pvscan-nomda.sh b/test/shell/lvmetad-pvscan-nomda.sh
index f7e13a72b304650b1ce611e5e19cee688e55dd6d..6a78b6cf3465e6f5a5372b3032d2427c793bd041 100644 (file)
--- a/test/shell/lvmetad-pvscan-nomda.sh
+++ b/test/shell/lvmetad-pvscan-nomda.sh
@@ -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

diff --git a/test/shell/lvmetad-restart.sh b/test/shell/lvmetad-restart.sh
index 8805bc8b807d85ed32450cf10c7d48da3e1862fa..18b2b2c148429b998673401726d7acb823ac0961 100644 (file)
--- a/test/shell/lvmetad-restart.sh
+++ b/test/shell/lvmetad-restart.sh
@@ -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
 

diff --git a/test/shell/lvmetad-test.sh b/test/shell/lvmetad-test.sh
index 146a7f19e65eeeeca50f38be73dda0427478b131..7d47979962f7d201a3ddc4bd5c3e086068ee6590 100644 (file)
--- a/test/shell/lvmetad-test.sh
+++ b/test/shell/lvmetad-test.sh
@@ -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
 

diff --git a/test/shell/lvmetad-warning.sh b/test/shell/lvmetad-warning.sh
index 44edb125a9900ad56b58081d4ca6812b5b162aac..4c8cc5951c96c639e53f985d670d37004655cc82 100644 (file)
--- a/test/shell/lvmetad-warning.sh
+++ b/test/shell/lvmetad-warning.sh
@@ -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