diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2015-04-14 16:39:24 +0200 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2015-05-07 15:50:28 +0200 |
| commit | bffa7a1a21c5a11d5a20bbaeb721a87ba3c56240 (patch) | |
| tree | b43ee9be83f4adbcaf80a6ed3ec6798d51f792ae | |
| parent | fade623691670ae7b7be34c7f21417ff2a185f6d (diff) | |
| download | lvm2-bffa7a1a21c5a11d5a20bbaeb721a87ba3c56240.tar.gz | |
tests: skip most tests with lvmpolld enabled
try not to run tests not related to polling at all. Not
definitive solution. Few tests needs to get investigated
before skiping for good with lvmpolld enabled
153 files changed, 342 insertions, 2 deletions
diff --git a/test/shell/activate-missing.sh b/test/shell/activate-missing.sh index 8e2ff1e7a..e33a6ef6c 100644 --- a/test/shell/activate-missing.sh +++ b/test/shell/activate-missing.sh @@ -18,6 +18,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 4 lvcreate -l1 -n linear1 $vg "$dev1" diff --git a/test/shell/activate-partial.sh b/test/shell/activate-partial.sh index 0b5d1b649..3720e1d26 100644 --- a/test/shell/activate-partial.sh +++ b/test/shell/activate-partial.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 lvcreate -aey --type mirror -m 1 -l 1 --nosync -n mirror $vg diff --git a/test/shell/activation-skip.sh b/test/shell/activation-skip.sh index ca562a7cd..5259d9dfd 100644 --- a/test/shell/activation-skip.sh +++ b/test/shell/activation-skip.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # Test skip activation flag -k|--setactivationskip aux prepare_vg diff --git a/test/shell/clvmd-restart.sh b/test/shell/clvmd-restart.sh index cb06bf610..afe48346c 100644 --- a/test/shell/clvmd-restart.sh +++ b/test/shell/clvmd-restart.sh @@ -16,6 +16,7 @@ export LVM_BINARY=lvm . lib/inittest # only clvmd based test, skip otherwise +test -e LOCAL_LVMPOLLD && skip test -e LOCAL_CLVMD || skip read LOCAL_CLVMD < LOCAL_CLVMD diff --git a/test/shell/covercmd.sh b/test/shell/covercmd.sh index c84c967de..7b5f2a6fd 100644 --- a/test/shell/covercmd.sh +++ b/test/shell/covercmd.sh @@ -16,6 +16,9 @@ . lib/inittest +# perhaps remove this condition due to lvm dumpconfig cmd +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 5 get_devs diff --git a/test/shell/discards-thin.sh b/test/shell/discards-thin.sh index a2cac5219..701fd6718 100644 --- a/test/shell/discards-thin.sh +++ b/test/shell/discards-thin.sh @@ -15,6 +15,9 @@ . lib/inittest +# unless we test merging... +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/dmeventd-restart.sh b/test/shell/dmeventd-restart.sh index 022b8a8e2..9ec72f2d1 100644 --- a/test/shell/dmeventd-restart.sh +++ b/test/shell/dmeventd-restart.sh @@ -11,6 +11,9 @@ . lib/inittest +# no mirror conversion seen +test -e LOCAL_LVMPOLLD && skip + aux prepare_dmeventd aux prepare_vg 5 diff --git a/test/shell/dumpconfig.sh b/test/shell/dumpconfig.sh index f52157fc7..719ea0228 100644 --- a/test/shell/dumpconfig.sh +++ b/test/shell/dumpconfig.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + flatten() { cat > flatten.config for s in `egrep '^[a-z]+ {$' flatten.config | sed -e s,{$,,`; do diff --git a/test/shell/error-usage.sh b/test/shell/error-usage.sh index 61e282b66..f617b61f2 100644 --- a/test/shell/error-usage.sh +++ b/test/shell/error-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which md5sum || skip aux prepare_pvs 1 diff --git a/test/shell/fsadm.sh b/test/shell/fsadm.sh index 368e7471c..12f159312 100644 --- a/test/shell/fsadm.sh +++ b/test/shell/fsadm.sh @@ -13,6 +13,8 @@ test_description='Exercise fsadm filesystem resize' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 1 100 # set to "skip" to avoid testing given fs and test warning result diff --git a/test/shell/inconsistent-metadata.sh b/test/shell/inconsistent-metadata.sh index 69d1f3328..992991c04 100644 --- a/test/shell/inconsistent-metadata.sh +++ b/test/shell/inconsistent-metadata.sh @@ -11,6 +11,9 @@ . lib/inittest +# no mirror conversion +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 12 lvcreate -aye --type mirror -m 1 -l 1 -n mirror $vg diff --git a/test/shell/listings.sh b/test/shell/listings.sh index fcf6308e1..32e197a5d 100644 --- a/test/shell/listings.sh +++ b/test/shell/listings.sh @@ -15,6 +15,9 @@ . lib/inittest +# no mirror conversion or snapshot merge +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 5 get_devs diff --git a/test/shell/lock-blocking.sh b/test/shell/lock-blocking.sh index 7c33067ec..5c004c9d3 100644 --- a/test/shell/lock-blocking.sh +++ b/test/shell/lock-blocking.sh @@ -13,8 +13,10 @@ test_description='test some blocking / non-blocking multi-vg operations' . lib/inittest -aux prepare_devs 3 +test -e LOCAL_LVMPOLLD && skip test -e LOCAL_CLVMD && skip + +aux prepare_devs 3 pvcreate "$dev1" "$dev2" vgcreate $vg "$dev1" "$dev2" diff --git a/test/shell/lock-parallel.sh b/test/shell/lock-parallel.sh index 98d3d4cfd..ebe6336d2 100644 --- a/test/shell/lock-parallel.sh +++ b/test/shell/lock-parallel.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext3 || skip which fsck || skip diff --git a/test/shell/lvchange-cache.sh b/test/shell/lvchange-cache.sh index 20826fbb9..9ce031429 100644 --- a/test/shell/lvchange-cache.sh +++ b/test/shell/lvchange-cache.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip aux prepare_vg 3 diff --git a/test/shell/lvchange-mirror.sh b/test/shell/lvchange-mirror.sh index f28e486f6..bd4c868c6 100644 --- a/test/shell/lvchange-mirror.sh +++ b/test/shell/lvchange-mirror.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # FIXME RESYNC doesn't work in cluster with exclusive activation # seriously broken! test -e LOCAL_CLVMD && skip diff --git a/test/shell/lvchange-partial-raid10.sh b/test/shell/lvchange-partial-raid10.sh index 8014abd40..d83d19366 100644 --- a/test/shell/lvchange-partial-raid10.sh +++ b/test/shell/lvchange-partial-raid10.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 3 2 || skip aux prepare_vg 4 diff --git a/test/shell/lvchange-partial.sh b/test/shell/lvchange-partial.sh index c65c07b87..7b1f68d3d 100644 --- a/test/shell/lvchange-partial.sh +++ b/test/shell/lvchange-partial.sh @@ -11,6 +11,7 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip aux prepare_vg 4 diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh index 4ce776fe8..eba8b2f54 100644 --- a/test/shell/lvchange-raid.sh +++ b/test/shell/lvchange-raid.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + # Writemostly has been in every version since the begining # Device refresh in 1.5.1 upstream and 1.3.4 < x < 1.4.0 in RHEL6 # Sync action in 1.5.0 upstream and 1.3.3 < x < 1.4.0 in RHEL6 diff --git a/test/shell/lvchange-raid10.sh b/test/shell/lvchange-raid10.sh index 0d17928b9..574ac7d84 100644 --- a/test/shell/lvchange-raid10.sh +++ b/test/shell/lvchange-raid10.sh @@ -13,6 +13,8 @@ TEST_RAID=raid10 . shell/lvchange-raid.sh +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 5 2 || skip run_types raid10 -m 1 -i 2 "$dev1" "$dev2" "$dev3" "$dev4" diff --git a/test/shell/lvchange-raid456.sh b/test/shell/lvchange-raid456.sh index b1dd1dbbd..bdce2e685 100644 --- a/test/shell/lvchange-raid456.sh +++ b/test/shell/lvchange-raid456.sh @@ -13,6 +13,8 @@ TEST_RAID=raid456 . shell/lvchange-raid.sh +test -e LOCAL_LVMPOLLD && skip + aux raid456_replace_works || skip aux have_raid 1 5 2 || skip diff --git a/test/shell/lvchange-syncaction-raid.sh b/test/shell/lvchange-syncaction-raid.sh index 9c51299e6..558157b35 100644 --- a/test/shell/lvchange-syncaction-raid.sh +++ b/test/shell/lvchange-syncaction-raid.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # Proper mismatch count 1.5.2+ upstream, 1.3.5 < x < 1.4.0 in RHEL6 aux have_raid 1 3 5 && ! aux have_raid 1 4 0 || diff --git a/test/shell/lvchange-thin.sh b/test/shell/lvchange-thin.sh index 87919bca2..5b513afe8 100644 --- a/test/shell/lvchange-thin.sh +++ b/test/shell/lvchange-thin.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip aux prepare_pvs 3 diff --git a/test/shell/lvconvert-cache-raid.sh b/test/shell/lvconvert-cache-raid.sh index faab25169..b8333d918 100644 --- a/test/shell/lvconvert-cache-raid.sh +++ b/test/shell/lvconvert-cache-raid.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip aux have_raid 1 0 0 || skip diff --git a/test/shell/lvconvert-cache-thin.sh b/test/shell/lvconvert-cache-thin.sh index 87256a4d2..12b8dfe3a 100644 --- a/test/shell/lvconvert-cache-thin.sh +++ b/test/shell/lvconvert-cache-thin.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip aux have_thin 1 0 0 || skip diff --git a/test/shell/lvconvert-cache.sh b/test/shell/lvconvert-cache.sh index ed414eddb..6ac62c41b 100644 --- a/test/shell/lvconvert-cache.sh +++ b/test/shell/lvconvert-cache.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip aux prepare_vg 5 80 diff --git a/test/shell/lvconvert-raid-allocation.sh b/test/shell/lvconvert-raid-allocation.sh index a1b1c3931..6b6e50288 100644 --- a/test/shell/lvconvert-raid-allocation.sh +++ b/test/shell/lvconvert-raid-allocation.sh @@ -11,6 +11,9 @@ . lib/inittest +# raids should not interact w/ lvmpolld I suppose +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 3 0 || skip aux prepare_pvs 5 diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index d3253eb0b..063fec4a7 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -14,6 +14,9 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-} . lib/inittest +# okozina:??? (mirror type referenced) +test -e LOCAL_LVMPOLLD && skip + get_image_pvs() { local d local images diff --git a/test/shell/lvconvert-raid10.sh b/test/shell/lvconvert-raid10.sh index c4b92f18d..244a79e32 100644 --- a/test/shell/lvconvert-raid10.sh +++ b/test/shell/lvconvert-raid10.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + get_image_pvs() { local d local images diff --git a/test/shell/lvconvert-raid456.sh b/test/shell/lvconvert-raid456.sh index 833b10e0c..0fb5a5b39 100644 --- a/test/shell/lvconvert-raid456.sh +++ b/test/shell/lvconvert-raid456.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + get_image_pvs() { local d local images diff --git a/test/shell/lvconvert-repair-dmeventd.sh b/test/shell/lvconvert-repair-dmeventd.sh index eed08197c..913fefa4d 100644 --- a/test/shell/lvconvert-repair-dmeventd.sh +++ b/test/shell/lvconvert-repair-dmeventd.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? (there's some interaction between lvmpolld and lvconvert --repair i'm afraid) +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip aux mirror_recovery_works || skip diff --git a/test/shell/lvconvert-repair-raid-dmeventd.sh b/test/shell/lvconvert-repair-raid-dmeventd.sh index eeb424ef0..df5544911 100644 --- a/test/shell/lvconvert-repair-raid-dmeventd.sh +++ b/test/shell/lvconvert-repair-raid-dmeventd.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext3 || skip aux have_raid 1 3 0 || skip diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh index 6b1e51f03..580516e6c 100644 --- a/test/shell/lvconvert-repair-raid.sh +++ b/test/shell/lvconvert-repair-raid.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 3 0 || skip aux raid456_replace_works || skip diff --git a/test/shell/lvconvert-repair-replace.sh b/test/shell/lvconvert-repair-replace.sh index bf031be48..d12f8fabe 100644 --- a/test/shell/lvconvert-repair-replace.sh +++ b/test/shell/lvconvert-repair-replace.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 6 aux lvmconf 'allocation/maximise_cling = 0' \ 'allocation/mirror_logs_require_separate_pvs = 1' diff --git a/test/shell/lvconvert-repair-snapshot.sh b/test/shell/lvconvert-repair-snapshot.sh index a0c0399e2..8cfebde8b 100644 --- a/test/shell/lvconvert-repair-snapshot.sh +++ b/test/shell/lvconvert-repair-snapshot.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 5 aux lvmconf 'allocation/maximise_cling = 0' \ 'allocation/mirror_logs_require_separate_pvs = 1' diff --git a/test/shell/lvconvert-repair-thin.sh b/test/shell/lvconvert-repair-thin.sh index 73f061c38..c699e1255 100644 --- a/test/shell/lvconvert-repair-thin.sh +++ b/test/shell/lvconvert-repair-thin.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip # diff --git a/test/shell/lvconvert-repair-transient-dmeventd.sh b/test/shell/lvconvert-repair-transient-dmeventd.sh index 4f6171db8..0db0b9612 100644 --- a/test/shell/lvconvert-repair-transient-dmeventd.sh +++ b/test/shell/lvconvert-repair-transient-dmeventd.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_dmeventd aux mirror_recovery_works || skip aux prepare_vg 5 diff --git a/test/shell/lvconvert-repair-transient.sh b/test/shell/lvconvert-repair-transient.sh index 9bf6a9d0c..d4e0d4fe6 100644 --- a/test/shell/lvconvert-repair-transient.sh +++ b/test/shell/lvconvert-repair-transient.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux mirror_recovery_works || skip aux prepare_vg 5 diff --git a/test/shell/lvconvert-repair.sh b/test/shell/lvconvert-repair.sh index 91437a6fd..1ebf322b7 100644 --- a/test/shell/lvconvert-repair.sh +++ b/test/shell/lvconvert-repair.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + recreate_vg_() { vgremove -ff $vg diff --git a/test/shell/lvconvert-snapshot.sh b/test/shell/lvconvert-snapshot.sh index 55fcb1a1c..a4e78ea51 100644 --- a/test/shell/lvconvert-snapshot.sh +++ b/test/shell/lvconvert-snapshot.sh @@ -14,6 +14,9 @@ . lib/inittest +# no merge +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 1 vgcreate -s 1k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-thin-external.sh b/test/shell/lvconvert-thin-external.sh index 1e9887a9c..d9737dd0e 100644 --- a/test/shell/lvconvert-thin-external.sh +++ b/test/shell/lvconvert-thin-external.sh @@ -14,6 +14,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip which fsck || skip diff --git a/test/shell/lvconvert-thin-raid.sh b/test/shell/lvconvert-thin-raid.sh index 3d7eee5c9..cf67b9e17 100644 --- a/test/shell/lvconvert-thin-raid.sh +++ b/test/shell/lvconvert-thin-raid.sh @@ -12,6 +12,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip aux have_raid 1 4 0 || skip diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh index 951f6943e..fdbfec56d 100644 --- a/test/shell/lvconvert-thin.sh +++ b/test/shell/lvconvert-thin.sh @@ -12,6 +12,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + prepare_lvs() { lvremove -f $vg lvcreate -L10M -n $lv1 $vg diff --git a/test/shell/lvconvert-twostep.sh b/test/shell/lvconvert-twostep.sh index 788b751dd..88f8f77dc 100644 --- a/test/shell/lvconvert-twostep.sh +++ b/test/shell/lvconvert-twostep.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 4 lvcreate -aey --type mirror -m 1 --mirrorlog disk --ignoremonitoring -L 1 -n mirror $vg diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh index 89efc4dc6..9e245c6a3 100644 --- a/test/shell/lvcreate-cache.sh +++ b/test/shell/lvcreate-cache.sh @@ -16,6 +16,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip # FIXME: parallel cache metadata allocator is crashing when used value 8000! diff --git a/test/shell/lvcreate-large-raid.sh b/test/shell/lvcreate-large-raid.sh index 182b2676e..c59ededaf 100644 --- a/test/shell/lvcreate-large-raid.sh +++ b/test/shell/lvcreate-large-raid.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # FIXME update test to make something useful on <16T aux can_use_16T || skip diff --git a/test/shell/lvcreate-large-raid10.sh b/test/shell/lvcreate-large-raid10.sh index de1cc0274..47dda2b6a 100644 --- a/test/shell/lvcreate-large-raid10.sh +++ b/test/shell/lvcreate-large-raid10.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # FIXME update test to make something useful on <16T aux can_use_16T || skip diff --git a/test/shell/lvcreate-large.sh b/test/shell/lvcreate-large.sh index 29bdd3344..e547fcc85 100644 --- a/test/shell/lvcreate-large.sh +++ b/test/shell/lvcreate-large.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # FIXME update test to make something useful on <16T aux can_use_16T || skip diff --git a/test/shell/lvcreate-mirror.sh b/test/shell/lvcreate-mirror.sh index f62bee780..6eb7e1c21 100644 --- a/test/shell/lvcreate-mirror.sh +++ b/test/shell/lvcreate-mirror.sh @@ -10,6 +10,10 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA . lib/inittest + +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 5 80 aux lvmconf 'allocation/maximise_cling = 0' \ 'allocation/mirror_logs_require_separate_pvs = 1' diff --git a/test/shell/lvcreate-missing.sh b/test/shell/lvcreate-missing.sh index 4553e98e8..012962fc9 100644 --- a/test/shell/lvcreate-missing.sh +++ b/test/shell/lvcreate-missing.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 2 aux disable_dev "$dev1" diff --git a/test/shell/lvcreate-operation.sh b/test/shell/lvcreate-operation.sh index fac721924..bfada7507 100644 --- a/test/shell/lvcreate-operation.sh +++ b/test/shell/lvcreate-operation.sh @@ -13,6 +13,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + cleanup_lvs() { lvremove -ff $vg (dm_table | not grep $vg) || \ diff --git a/test/shell/lvcreate-pvtags.sh b/test/shell/lvcreate-pvtags.sh index 6bfb55b79..d411b4d51 100644 --- a/test/shell/lvcreate-pvtags.sh +++ b/test/shell/lvcreate-pvtags.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 3 aux lvmconf 'allocation/maximise_cling = 0' \ 'allocation/mirror_logs_require_separate_pvs = 1' diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index 956ebb5a4..2ddc7e35b 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + lv_devices() { test $3 -eq $(get lv_devices $1/$2 | wc -w) } diff --git a/test/shell/lvcreate-raid10.sh b/test/shell/lvcreate-raid10.sh index 5f22a2d40..884653b46 100644 --- a/test/shell/lvcreate-raid10.sh +++ b/test/shell/lvcreate-raid10.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + lv_devices() { test $3 -eq $(get lv_devices $1/$2 | wc -w) } diff --git a/test/shell/lvcreate-repair.sh b/test/shell/lvcreate-repair.sh index 169056547..469bf3946 100644 --- a/test/shell/lvcreate-repair.sh +++ b/test/shell/lvcreate-repair.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 # fail multiple devices diff --git a/test/shell/lvcreate-signature-wiping.sh b/test/shell/lvcreate-signature-wiping.sh index 32ef36381..d2d23c595 100644 --- a/test/shell/lvcreate-signature-wiping.sh +++ b/test/shell/lvcreate-signature-wiping.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + init_lv_() { mkswap "$DM_DEV_DIR/$vg/$lv1" } diff --git a/test/shell/lvcreate-small-snap.sh b/test/shell/lvcreate-small-snap.sh index b29c5f8f8..b5610c782 100644 --- a/test/shell/lvcreate-small-snap.sh +++ b/test/shell/lvcreate-small-snap.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs vgcreate -s 1k $vg $(cat DEVICES) diff --git a/test/shell/lvcreate-striped-mirror.sh b/test/shell/lvcreate-striped-mirror.sh index eaa7fb859..bd339404f 100644 --- a/test/shell/lvcreate-striped-mirror.sh +++ b/test/shell/lvcreate-striped-mirror.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 9 lvcreate -aey --nosync -i2 -l2 --type mirror -m1 --mirrorlog core -n $lv1 $vg 2>&1 | tee log diff --git a/test/shell/lvcreate-thin-big.sh b/test/shell/lvcreate-thin-big.sh index 1a8fa3057..0ef5cbcfd 100644 --- a/test/shell/lvcreate-thin-big.sh +++ b/test/shell/lvcreate-thin-big.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip # Test --poolmetadatasize range diff --git a/test/shell/lvcreate-thin-external.sh b/test/shell/lvcreate-thin-external.sh index 65401fbdb..bb5cef216 100644 --- a/test/shell/lvcreate-thin-external.sh +++ b/test/shell/lvcreate-thin-external.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip which fsck || skip diff --git a/test/shell/lvcreate-thin-power2.sh b/test/shell/lvcreate-thin-power2.sh index ed62db3f8..fcae6439f 100644 --- a/test/shell/lvcreate-thin-power2.sh +++ b/test/shell/lvcreate-thin-power2.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/lvcreate-thin-snap.sh b/test/shell/lvcreate-thin-snap.sh index 784eb5d29..a919f7a71 100644 --- a/test/shell/lvcreate-thin-snap.sh +++ b/test/shell/lvcreate-thin-snap.sh @@ -12,6 +12,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + check_lv_field_modules_() { mod=$1 diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh index 66d986bcf..18e4644fa 100644 --- a/test/shell/lvcreate-thin.sh +++ b/test/shell/lvcreate-thin.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + check_lv_field_modules_() { mod=$1 diff --git a/test/shell/lvcreate-usage.sh b/test/shell/lvcreate-usage.sh index 45fa85056..f19cf06ab 100644 --- a/test/shell/lvcreate-usage.sh +++ b/test/shell/lvcreate-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 aux pvcreate --metadatacopies 0 "$dev1" vgcreate $vg $(cat DEVICES) diff --git a/test/shell/lvextend-percent-extents.sh b/test/shell/lvextend-percent-extents.sh index 9b5dc5d09..ec98e5913 100644 --- a/test/shell/lvextend-percent-extents.sh +++ b/test/shell/lvextend-percent-extents.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 2 128 vgcreate $vg $(cat DEVICES) diff --git a/test/shell/lvextend-snapshot-dmeventd.sh b/test/shell/lvextend-snapshot-dmeventd.sh index f073a8157..5b423006c 100644 --- a/test/shell/lvextend-snapshot-dmeventd.sh +++ b/test/shell/lvextend-snapshot-dmeventd.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + extend() { lvextend --use-policies --config "activation { snapshot_autoextend_threshold = $1 }" $vg/snap } diff --git a/test/shell/lvextend-snapshot-policy.sh b/test/shell/lvextend-snapshot-policy.sh index b0a611eff..c76e36edc 100644 --- a/test/shell/lvextend-snapshot-policy.sh +++ b/test/shell/lvextend-snapshot-policy.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip extend() { diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh index d7be3a2ac..78dce6d4e 100644 --- a/test/shell/lvextend-thin-metadata-dmeventd.sh +++ b/test/shell/lvextend-thin-metadata-dmeventd.sh @@ -12,6 +12,8 @@ # Test autoextension of thin metadata volume . lib/inittest +test -e LOCAL_LVMPOLLD && skip + meta_percent_() { get lv_field $vg/pool metadata_percent | cut -d. -f1 } diff --git a/test/shell/lvextend-thin.sh b/test/shell/lvextend-thin.sh index f9e24cea6..ab538a752 100644 --- a/test/shell/lvextend-thin.sh +++ b/test/shell/lvextend-thin.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip aux prepare_vg 3 diff --git a/test/shell/lvmcache-exercise.sh b/test/shell/lvmcache-exercise.sh index 2aaf65095..f0d3ee949 100644 --- a/test/shell/lvmcache-exercise.sh +++ b/test/shell/lvmcache-exercise.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 5 vgcreate $vg1 "$dev1" diff --git a/test/shell/lvresize-mirror.sh b/test/shell/lvresize-mirror.sh index 0b9f526f7..2acda629a 100644 --- a/test/shell/lvresize-mirror.sh +++ b/test/shell/lvresize-mirror.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD || skip + aux prepare_vg 5 for deactivate in true false; do diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh index 8c7d909f6..1a1a75f02 100644 --- a/test/shell/lvresize-raid.sh +++ b/test/shell/lvresize-raid.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 3 0 || skip aux prepare_pvs 6 80 diff --git a/test/shell/lvresize-raid10.sh b/test/shell/lvresize-raid10.sh index aead38534..4fe49f693 100644 --- a/test/shell/lvresize-raid10.sh +++ b/test/shell/lvresize-raid10.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_raid 1 3 0 || skip aux prepare_vg 5 diff --git a/test/shell/lvresize-rounding.sh b/test/shell/lvresize-rounding.sh index 5c3053985..398740e0b 100644 --- a/test/shell/lvresize-rounding.sh +++ b/test/shell/lvresize-rounding.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 3 22 vgcreate -s 32K $vg $(cat DEVICES) diff --git a/test/shell/lvresize-thin-external-origin.sh b/test/shell/lvresize-thin-external-origin.sh index e4463e2bd..82b7f8b64 100644 --- a/test/shell/lvresize-thin-external-origin.sh +++ b/test/shell/lvresize-thin-external-origin.sh @@ -12,6 +12,8 @@ # Test resize of thin volume with external origin . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 2 0 || skip # Pretend we miss the external_origin_extend feature diff --git a/test/shell/lvresize-thin-metadata.sh b/test/shell/lvresize-thin-metadata.sh index 9e2ae4d0f..4416b6776 100644 --- a/test/shell/lvresize-thin-metadata.sh +++ b/test/shell/lvresize-thin-metadata.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 10 0 || skip aux prepare_pvs 3 1256 diff --git a/test/shell/lvresize-usage.sh b/test/shell/lvresize-usage.sh index a3ba2cf00..00bae1426 100644 --- a/test/shell/lvresize-usage.sh +++ b/test/shell/lvresize-usage.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 2 80 lvcreate -L 10M -n lv -i2 $vg diff --git a/test/shell/lvs-cache.sh b/test/shell/lvs-cache.sh index 08e83bdad..73706b760 100644 --- a/test/shell/lvs-cache.sh +++ b/test/shell/lvs-cache.sh @@ -16,6 +16,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_cache 1 3 0 || skip aux prepare_vg 5 8000 diff --git a/test/shell/mda-rollback.sh b/test/shell/mda-rollback.sh index fa8e376d9..5f348fb9e 100644 --- a/test/shell/mda-rollback.sh +++ b/test/shell/mda-rollback.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 vgcreate --metadatasize 128k $vg1 "$dev1" "$dev2" "$dev3" diff --git a/test/shell/mdata-strings.sh b/test/shell/mdata-strings.sh index a1598ad32..529e59990 100644 --- a/test/shell/mdata-strings.sh +++ b/test/shell/mdata-strings.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # For udev impossible to create test "$LVM_TEST_DEVDIR" = "/dev" && skip diff --git a/test/shell/metadata-balance.sh b/test/shell/metadata-balance.sh index 5ee0eba6a..869297e28 100644 --- a/test/shell/metadata-balance.sh +++ b/test/shell/metadata-balance.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 6 echo Make sure we can ignore / un-ignore mdas on a per-PV basis diff --git a/test/shell/metadata-dirs.sh b/test/shell/metadata-dirs.sh index f4a41bc3c..eed651224 100644 --- a/test/shell/metadata-dirs.sh +++ b/test/shell/metadata-dirs.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 pvcreate --metadatacopies 0 $(cat DEVICES) diff --git a/test/shell/metadata.sh b/test/shell/metadata.sh index 251942f56..8e3503f74 100644 --- a/test/shell/metadata.sh +++ b/test/shell/metadata.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 5 pvcreate "$dev1" diff --git a/test/shell/mirror-vgreduce-removemissing.sh b/test/shell/mirror-vgreduce-removemissing.sh index e4791f806..139b7cd2d 100644 --- a/test/shell/mirror-vgreduce-removemissing.sh +++ b/test/shell/mirror-vgreduce-removemissing.sh @@ -17,6 +17,9 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-} . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + lv_is_on_ () { local lv=$vg/$1 diff --git a/test/shell/name-mangling.sh b/test/shell/name-mangling.sh index ee3499456..6bdf4a1d9 100644 --- a/test/shell/name-mangling.sh +++ b/test/shell/name-mangling.sh @@ -15,6 +15,7 @@ # so skip duplicate CLMVD and lvmetad test test -e LOCAL_CLVMD && skip test -e LOCAL_LVMETAD && skip +test -e LOCAL_LVMPOLLD && skip CHARACTER_WHITELIST="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789#+-.:=@_" FAIL_MIXED_STR="contains mixed mangled and unmangled characters" diff --git a/test/shell/nomda-missing.sh b/test/shell/nomda-missing.sh index 7de458b2f..a8864a8b5 100644 --- a/test/shell/nomda-missing.sh +++ b/test/shell/nomda-missing.sh @@ -12,6 +12,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 4 pvcreate "$dev1" "$dev2" pvcreate --metadatacopies 0 "$dev3" "$dev4" diff --git a/test/shell/nomda-restoremissing.sh b/test/shell/nomda-restoremissing.sh index 01a77d068..8607e9424 100644 --- a/test/shell/nomda-restoremissing.sh +++ b/test/shell/nomda-restoremissing.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 pvchange --metadataignore y "$dev1" diff --git a/test/shell/orphan-ondisk.sh b/test/shell/orphan-ondisk.sh index 839507307..f4e18f440 100644 --- a/test/shell/orphan-ondisk.sh +++ b/test/shell/orphan-ondisk.sh @@ -11,5 +11,7 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 2 vgreduce $vg "$dev1" 2>&1 | not grep -i 'parse error' diff --git a/test/shell/pool-labels.sh b/test/shell/pool-labels.sh index a2163e87f..70d5a64bd 100644 --- a/test/shell/pool-labels.sh +++ b/test/shell/pool-labels.sh @@ -13,6 +13,7 @@ # lvmetad does not handle pool labels so skip test. test ! -e LOCAL_LVMETAD || skip +test -e LOCAL_LVMPOLLD && skip env printf "" || skip # skip if printf is not available diff --git a/test/shell/process-each-duplicate-vgnames.sh b/test/shell/process-each-duplicate-vgnames.sh index 9b1f8076e..f2b47650c 100644 --- a/test/shell/process-each-duplicate-vgnames.sh +++ b/test/shell/process-each-duplicate-vgnames.sh @@ -9,6 +9,8 @@ test_description='Test vgs with duplicate vg names' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 pvcreate "$dev1" diff --git a/test/shell/process-each-lv.sh b/test/shell/process-each-lv.sh index bd9e04243..78eb14ec5 100644 --- a/test/shell/process-each-lv.sh +++ b/test/shell/process-each-lv.sh @@ -16,6 +16,8 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-} . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 10 # diff --git a/test/shell/process-each-pv-nomda-all.sh b/test/shell/process-each-pv-nomda-all.sh index 44cde5a46..1a2af58c0 100644 --- a/test/shell/process-each-pv-nomda-all.sh +++ b/test/shell/process-each-pv-nomda-all.sh @@ -13,6 +13,8 @@ test_description='Test process_each_pv with zero mda' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 14 # for vg1 diff --git a/test/shell/process-each-pv-nomda.sh b/test/shell/process-each-pv-nomda.sh index 82e6bc4ee..642f2e410 100644 --- a/test/shell/process-each-pv-nomda.sh +++ b/test/shell/process-each-pv-nomda.sh @@ -13,6 +13,8 @@ test_description='Test process_each_pv with zero mda' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 pvcreate "$dev1" --metadatacopies 0 diff --git a/test/shell/process-each-pv.sh b/test/shell/process-each-pv.sh index d3a1863e2..f4b8fd1e0 100644 --- a/test/shell/process-each-pv.sh +++ b/test/shell/process-each-pv.sh @@ -13,6 +13,8 @@ test_description='Exercise toollib process_each_pv' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 14 # diff --git a/test/shell/process-each-pvresize.sh b/test/shell/process-each-pvresize.sh index 02fe081c8..493c24bcf 100644 --- a/test/shell/process-each-pvresize.sh +++ b/test/shell/process-each-pvresize.sh @@ -13,6 +13,8 @@ test_description='Exercise toollib process_each_pv' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 14 # diff --git a/test/shell/process-each-vg.sh b/test/shell/process-each-vg.sh index e8690f51e..f93acdae9 100644 --- a/test/shell/process-each-vg.sh +++ b/test/shell/process-each-vg.sh @@ -13,6 +13,8 @@ test_description='Exercise toollib process_each_vg' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 6 # diff --git a/test/shell/profiles-thin.sh b/test/shell/profiles-thin.sh index d3e282a2e..9578ed1d0 100644 --- a/test/shell/profiles-thin.sh +++ b/test/shell/profiles-thin.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + DEV_SIZE=32 # check we have thinp support compiled in diff --git a/test/shell/profiles.sh b/test/shell/profiles.sh index e054c8887..81871296d 100644 --- a/test/shell/profiles.sh +++ b/test/shell/profiles.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + MSG_FAILED_TO_APPLY_CMD_PROFILE="Failed to apply command profile" MSG_IGNORING_INVALID_CMD_PROFILE="Ignoring invalid command profile" MSG_FAILED_TO_APPLY_MDA_PROFILE="Failed to apply metadata profile" diff --git a/test/shell/pv-duplicate-uuid.sh b/test/shell/pv-duplicate-uuid.sh index 1763142a9..cc98384b6 100644 --- a/test/shell/pv-duplicate-uuid.sh +++ b/test/shell/pv-duplicate-uuid.sh @@ -12,6 +12,8 @@ # Test 'Found duplicate' is shown . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 pvcreate "$dev1" diff --git a/test/shell/pv-duplicate.sh b/test/shell/pv-duplicate.sh index 9b218e6aa..ecd61256f 100644 --- a/test/shell/pv-duplicate.sh +++ b/test/shell/pv-duplicate.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 pvcreate "$dev1" diff --git a/test/shell/pv-min-size.sh b/test/shell/pv-min-size.sh index d29e94c9a..eb62c73a6 100644 --- a/test/shell/pv-min-size.sh +++ b/test/shell/pv-min-size.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # use small default size - 512KB aux lvmconf 'devices/pv_min_size = 512' diff --git a/test/shell/pvchange-usage.sh b/test/shell/pvchange-usage.sh index e5695b6a0..8cffb0689 100644 --- a/test/shell/pvchange-usage.sh +++ b/test/shell/pvchange-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + check_changed_uuid_() { test "$1" != "$(get pv_field "$2" uuid)" || die "UUID has not changed!" } diff --git a/test/shell/pvcreate-bootloaderarea.sh b/test/shell/pvcreate-bootloaderarea.sh index 6dd45f597..68c08822f 100644 --- a/test/shell/pvcreate-bootloaderarea.sh +++ b/test/shell/pvcreate-bootloaderarea.sh @@ -13,6 +13,8 @@ test_description='Test pvcreate bootloader area support' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 1 aux lvmconf 'global/suffix=0' 'global/units="b"' diff --git a/test/shell/pvcreate-ff.sh b/test/shell/pvcreate-ff.sh index 1cbf0ff1b..4ac5a611e 100644 --- a/test/shell/pvcreate-ff.sh +++ b/test/shell/pvcreate-ff.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 pvcreate "$dev1" vgcreate foo "$dev1" diff --git a/test/shell/pvcreate-metadata0.sh b/test/shell/pvcreate-metadata0.sh index 263bd88f7..48ebc83a2 100644 --- a/test/shell/pvcreate-metadata0.sh +++ b/test/shell/pvcreate-metadata0.sh @@ -17,6 +17,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 128 #lv_snap=$lv2 diff --git a/test/shell/pvcreate-operation-md.sh b/test/shell/pvcreate-operation-md.sh index 829121524..db532168b 100644 --- a/test/shell/pvcreate-operation-md.sh +++ b/test/shell/pvcreate-operation-md.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # skip this test if mdadm or sfdisk (or others) aren't available which sfdisk || skip diff --git a/test/shell/pvcreate-operation.sh b/test/shell/pvcreate-operation.sh index e72f2b923..6593877a9 100644 --- a/test/shell/pvcreate-operation.sh +++ b/test/shell/pvcreate-operation.sh @@ -10,6 +10,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux lvmconf 'devices/md_component_detection = 1' aux prepare_devs 4 diff --git a/test/shell/pvcreate-usage.sh b/test/shell/pvcreate-usage.sh index 5e916c396..ed3b4f461 100644 --- a/test/shell/pvcreate-usage.sh +++ b/test/shell/pvcreate-usage.sh @@ -14,6 +14,8 @@ PAGESIZE=$(getconf PAGESIZE) . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 4 #COMM 'pvcreate rejects negative setphysicalvolumesize' diff --git a/test/shell/read-ahead.sh b/test/shell/read-ahead.sh index 764bef132..322a527db 100644 --- a/test/shell/read-ahead.sh +++ b/test/shell/read-ahead.sh @@ -17,6 +17,8 @@ test_description='Test read-ahead functionality' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 5 #COMM "test various read ahead settings (bz450922)" diff --git a/test/shell/select-report.sh b/test/shell/select-report.sh index f56aa21e4..a79457eee 100644 --- a/test/shell/select-report.sh +++ b/test/shell/select-report.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 6 16 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/test/shell/select-tools-thin.sh b/test/shell/select-tools-thin.sh index f4d49eb2b..37c4856c9 100644 --- a/test/shell/select-tools-thin.sh +++ b/test/shell/select-tools-thin.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip aux prepare_pvs 1 16 diff --git a/test/shell/select-tools.sh b/test/shell/select-tools.sh index b9e4b2f16..631c6379c 100644 --- a/test/shell/select-tools.sh +++ b/test/shell/select-tools.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 12 vgcreate -s 4m $vg1 "$dev1" "$dev2" diff --git a/test/shell/snapshot-autoumount-dmeventd.sh b/test/shell/snapshot-autoumount-dmeventd.sh index 860d170b8..d369dac06 100644 --- a/test/shell/snapshot-autoumount-dmeventd.sh +++ b/test/shell/snapshot-autoumount-dmeventd.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext2 || skip aux lvmconf "activation/snapshot_autoextend_percent = 0" \ diff --git a/test/shell/snapshot-cluster.sh b/test/shell/snapshot-cluster.sh index 051c16516..47c8d2e25 100644 --- a/test/shell/snapshot-cluster.sh +++ b/test/shell/snapshot-cluster.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 1 lvcreate -aey -L1 -n $lv1 $vg diff --git a/test/shell/snapshot-lvm1.sh b/test/shell/snapshot-lvm1.sh index f6afe148c..0abba0c85 100644 --- a/test/shell/snapshot-lvm1.sh +++ b/test/shell/snapshot-lvm1.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 vgcreate --metadatatype 1 $vg $(cat DEVICES) diff --git a/test/shell/snapshot-maxsize.sh b/test/shell/snapshot-maxsize.sh index 3949f1964..e24f96552 100644 --- a/test/shell/snapshot-maxsize.sh +++ b/test/shell/snapshot-maxsize.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 1 vgcreate -s 1K $vg $(cat DEVICES) diff --git a/test/shell/snapshot-rename.sh b/test/shell/snapshot-rename.sh index 8d1eefba7..47bf21383 100644 --- a/test/shell/snapshot-rename.sh +++ b/test/shell/snapshot-rename.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 1 lvcreate -aey -L1 -n $lv1 $vg diff --git a/test/shell/snapshot-usage-exa.sh b/test/shell/snapshot-usage-exa.sh index ae5ca6d20..133014b2b 100644 --- a/test/shell/snapshot-usage-exa.sh +++ b/test/shell/snapshot-usage-exa.sh @@ -14,6 +14,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux can_use_16T || skip aux prepare_pvs 1 diff --git a/test/shell/snapshot-usage.sh b/test/shell/snapshot-usage.sh index e3db1fb26..af7519b8e 100644 --- a/test/shell/snapshot-usage.sh +++ b/test/shell/snapshot-usage.sh @@ -13,6 +13,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + MKFS=mkfs.ext2 which $MKFS || skip diff --git a/test/shell/stray-device-node.sh b/test/shell/stray-device-node.sh index 0ff4796cd..09d9e75ed 100644 --- a/test/shell/stray-device-node.sh +++ b/test/shell/stray-device-node.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 cp -r "$dev1" "$DM_DEV_DIR/stray" diff --git a/test/shell/system_id.sh b/test/shell/system_id.sh index ff03e14d3..78067e951 100644 --- a/test/shell/system_id.sh +++ b/test/shell/system_id.sh @@ -13,6 +13,8 @@ test_description='Test system_id' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 1 # with clvm enabled, vgcreate with no -c option creates a clustered vg, diff --git a/test/shell/tags.sh b/test/shell/tags.sh index bc66d15c7..37d738fd4 100644 --- a/test/shell/tags.sh +++ b/test/shell/tags.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 # vgcreate with --addtag diff --git a/test/shell/test-partition.sh b/test/shell/test-partition.sh index f68d57271..0cdaa8705 100644 --- a/test/shell/test-partition.sh +++ b/test/shell/test-partition.sh @@ -19,6 +19,8 @@ LVM_TEST_CONFIG_DEVICES="types = [\"device-mapper\", 142]" . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which sfdisk || skip aux prepare_pvs 1 30 diff --git a/test/shell/thin-autoumount-dmeventd.sh b/test/shell/thin-autoumount-dmeventd.sh index a77ad082c..00ea8596f 100644 --- a/test/shell/thin-autoumount-dmeventd.sh +++ b/test/shell/thin-autoumount-dmeventd.sh @@ -18,6 +18,8 @@ is_dir_mounted_() . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/thin-defaults.sh b/test/shell/thin-defaults.sh index 3a681a1f1..4341899b2 100644 --- a/test/shell/thin-defaults.sh +++ b/test/shell/thin-defaults.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/thin-restore.sh b/test/shell/thin-restore.sh index fd4118f21..1ac4f66d6 100644 --- a/test/shell/thin-restore.sh +++ b/test/shell/thin-restore.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/thin-volume-list.sh b/test/shell/thin-volume-list.sh index 32d13b8e0..e173d8732 100644 --- a/test/shell/thin-volume-list.sh +++ b/test/shell/thin-volume-list.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Main # diff --git a/test/shell/topology-support.sh b/test/shell/topology-support.sh index f1e42a8d6..ebb72200a 100644 --- a/test/shell/topology-support.sh +++ b/test/shell/topology-support.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which mkfs.ext3 || skip lvdev_() { diff --git a/test/shell/unknown-segment.sh b/test/shell/unknown-segment.sh index b07e1b5f2..34e0cc304 100644 --- a/test/shell/unknown-segment.sh +++ b/test/shell/unknown-segment.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 4 lvcreate -an -Zn -l 1 -n $lv1 $vg diff --git a/test/shell/unlost-pv.sh b/test/shell/unlost-pv.sh index 980c45179..4245dab38 100644 --- a/test/shell/unlost-pv.sh +++ b/test/shell/unlost-pv.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + check_() { # vgscan needs --cache option for direct scan if lvmetad is used test -e LOCAL_LVMETAD && cache="--cache" diff --git a/test/shell/vg-name-from-env.sh b/test/shell/vg-name-from-env.sh index 67ad5c558..a3d1b9ab5 100644 --- a/test/shell/vg-name-from-env.sh +++ b/test/shell/vg-name-from-env.sh @@ -9,6 +9,8 @@ test_description='Test the vg name for an lv from env var' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 pvcreate "$dev1" diff --git a/test/shell/vgcfgbackup-usage.sh b/test/shell/vgcfgbackup-usage.sh index eb3698397..b0faf3863 100644 --- a/test/shell/vgcfgbackup-usage.sh +++ b/test/shell/vgcfgbackup-usage.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 pvcreate --metadatacopies 0 "$dev4" diff --git a/test/shell/vgchange-many.sh b/test/shell/vgchange-many.sh index cbb436313..7b3d557c1 100644 --- a/test/shell/vgchange-many.sh +++ b/test/shell/vgchange-many.sh @@ -12,6 +12,8 @@ # Check perfomance of activation and deactivation . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # FIXME: lvmetad fails with i.e. 1500 device on memory failure... # Number of LVs to create diff --git a/test/shell/vgchange-maxlv.sh b/test/shell/vgchange-maxlv.sh index 35ce5d6c1..613d985ee 100644 --- a/test/shell/vgchange-maxlv.sh +++ b/test/shell/vgchange-maxlv.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_dmeventd aux prepare_pvs 3 diff --git a/test/shell/vgchange-partial.sh b/test/shell/vgchange-partial.sh index 7fd984016..f9c3ac02e 100644 --- a/test/shell/vgchange-partial.sh +++ b/test/shell/vgchange-partial.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 2 aux disable_dev "$dev1" diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index e564337d8..fced80b65 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -1,4 +1,4 @@ -#!/bin/sh +g!/bin/sh # Copyright (C) 2008 Red Hat, Inc. All rights reserved. # # This copyrighted material is made available to anyone wishing to use, @@ -13,6 +13,8 @@ test_description='Exercise some vgchange diagnostics' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 pvcreate --metadatacopies 0 "$dev1" diff --git a/test/shell/vgck.sh b/test/shell/vgck.sh index 629b6e7fd..a4930aae0 100644 --- a/test/shell/vgck.sh +++ b/test/shell/vgck.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 lvcreate -n blabla -L 1 $vg diff --git a/test/shell/vgcreate-many-pvs.sh b/test/shell/vgcreate-many-pvs.sh index c6d3852b7..bb78cafa7 100644 --- a/test/shell/vgcreate-many-pvs.sh +++ b/test/shell/vgcreate-many-pvs.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + # # Test to exercise larger number of PVs in a VG # Related to https://bugzilla.redhat.com/show_bug.cgi?id=736027 diff --git a/test/shell/vgcreate-usage.sh b/test/shell/vgcreate-usage.sh index a1d178d39..df0094c40 100644 --- a/test/shell/vgcreate-usage.sh +++ b/test/shell/vgcreate-usage.sh @@ -13,6 +13,8 @@ test_description='Exercise some vgcreate diagnostics' . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 3 pvcreate "$dev1" "$dev2" pvcreate --metadatacopies 0 "$dev3" diff --git a/test/shell/vgextend-restoremissing.sh b/test/shell/vgextend-restoremissing.sh index 7b7748fd7..5af552098 100644 --- a/test/shell/vgextend-restoremissing.sh +++ b/test/shell/vgextend-restoremissing.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 lvcreate -an -Zn --type mirror -m 1 -l 1 -n mirror $vg diff --git a/test/shell/vgextend-usage.sh b/test/shell/vgextend-usage.sh index 93401f0c7..65665bcaf 100644 --- a/test/shell/vgextend-usage.sh +++ b/test/shell/vgextend-usage.sh @@ -15,6 +15,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 5 for mdatype in 1 2 diff --git a/test/shell/vgimportclone.sh b/test/shell/vgimportclone.sh index c3d7e523d..0b1af384e 100644 --- a/test/shell/vgimportclone.sh +++ b/test/shell/vgimportclone.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 2 vgcreate --metadatasize 128k $vg1 "$dev1" diff --git a/test/shell/vgmerge-operation.sh b/test/shell/vgmerge-operation.sh index 261953eef..3e2253604 100644 --- a/test/shell/vgmerge-operation.sh +++ b/test/shell/vgmerge-operation.sh @@ -13,6 +13,9 @@ test_description='Test vgmerge operation' . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 64 # 'vgmerge succeeds with single linear LV in source VG' diff --git a/test/shell/vgmerge-usage.sh b/test/shell/vgmerge-usage.sh index d8fa09c15..981a964ee 100644 --- a/test/shell/vgmerge-usage.sh +++ b/test/shell/vgmerge-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_pvs 4 # 'vgmerge normal operation' diff --git a/test/shell/vgreduce-usage.sh b/test/shell/vgreduce-usage.sh index 52c5f36cf..46427d64f 100644 --- a/test/shell/vgreduce-usage.sh +++ b/test/shell/vgreduce-usage.sh @@ -11,6 +11,9 @@ . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 4 for mdatype in 1 2 diff --git a/test/shell/vgremove-corrupt-vg.sh b/test/shell/vgremove-corrupt-vg.sh index f709e4eb1..dc3c9dbac 100644 --- a/test/shell/vgremove-corrupt-vg.sh +++ b/test/shell/vgremove-corrupt-vg.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_vg 3 lvcreate -n blabla -L 1 $vg -an --zero n diff --git a/test/shell/vgrename-usage.sh b/test/shell/vgrename-usage.sh index de1b9332b..59c339766 100644 --- a/test/shell/vgrename-usage.sh +++ b/test/shell/vgrename-usage.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 4 pvcreate "$dev1" "$dev2" pvcreate --metadatacopies 0 "$dev3" "$dev4" diff --git a/test/shell/vgsplit-operation.sh b/test/shell/vgsplit-operation.sh index 91cdcdcb4..3ca453390 100644 --- a/test/shell/vgsplit-operation.sh +++ b/test/shell/vgsplit-operation.sh @@ -16,6 +16,9 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-} . lib/inittest +# okozina:??? +test -e LOCAL_LVMPOLLD && skip + COMM() { LAST_TEST="$@" } diff --git a/test/shell/vgsplit-raid.sh b/test/shell/vgsplit-raid.sh index a7c9687f6..2fe734f9b 100644 --- a/test/shell/vgsplit-raid.sh +++ b/test/shell/vgsplit-raid.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + COMM() { LAST_TEST="$@" } diff --git a/test/shell/vgsplit-stacked.sh b/test/shell/vgsplit-stacked.sh index 42010fc6b..6a04f07a4 100644 --- a/test/shell/vgsplit-stacked.sh +++ b/test/shell/vgsplit-stacked.sh @@ -11,6 +11,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux extend_filter_LVMTEST aux prepare_pvs 3 diff --git a/test/shell/vgsplit-thin.sh b/test/shell/vgsplit-thin.sh index 7b06132fd..0f6b427dc 100644 --- a/test/shell/vgsplit-thin.sh +++ b/test/shell/vgsplit-thin.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux have_thin 1 0 0 || skip aux prepare_devs 5 diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh index fe999f90c..b0422d535 100644 --- a/test/shell/vgsplit-usage.sh +++ b/test/shell/vgsplit-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + aux prepare_devs 5 for mdatype in 1 2 diff --git a/test/shell/zero-usage.sh b/test/shell/zero-usage.sh index 046b3f5fe..df9052942 100644 --- a/test/shell/zero-usage.sh +++ b/test/shell/zero-usage.sh @@ -13,6 +13,8 @@ . lib/inittest +test -e LOCAL_LVMPOLLD && skip + which md5sum || skip aux prepare_pvs 1 |