tests: add SKIP_WITH_LVMLOCKD

to all tests that don't already used vgcreate $SHARED
2025-01-03 05:18:29 +03:00 · 2016-02-22 16:13:42 -06:00 · 2016-02-22 16:13:42 -06:00 · f54253d396
commit f54253d396
parent 5d7e83c73c
222 changed files with 249 additions and 0 deletions
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@ -11,6 +11,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_CLVMD=1

 . lib/inittest
--- a/test/api/vgtest.sh
+++ b/test/api/vgtest.sh
@ -13,6 +13,8 @@
 # tests lvm2app library
 #

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_pvs 2
--- a/test/lib/inittest.sh
+++ b/test/lib/inittest.sh
@ -37,6 +37,8 @@ test -n "$SKIP_WITH_LVMETAD" && test -n "$LVM_TEST_LVMETAD" && initskip

 test -n "$SKIP_WITH_LVMPOLLD" && test -n "$LVM_TEST_LVMPOLLD" && initskip

+test -n "$SKIP_WITH_LVMLOCKD" && test -n "$LVM_TEST_LVMLOCKD" && initskip
+
 unset CDPATH

 # grab some common utilities
--- a/test/shell/000-basic.sh
+++ b/test/shell/000-basic.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/activate-minor.sh
+++ b/test/shell/activate-minor.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/activate-missing-segment.sh
+++ b/test/shell/activate-missing-segment.sh
@ -16,6 +16,7 @@
 #   instead lvconvert --repair them?)
 # - linear LVs with bits missing are not activated

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/activate-missing.sh
+++ b/test/shell/activate-missing.sh
@ -16,6 +16,7 @@
 #   instead lvconvert --repair them?)
 # - linear LVs with bits missing are not activated

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/activate-partial.sh
+++ b/test/shell/activate-partial.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/activation-skip.sh
+++ b/test/shell/activation-skip.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/backup-read-only.sh
+++ b/test/shell/backup-read-only.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_CLVMD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/clvmd-restart.sh
+++ b/test/shell/clvmd-restart.sh
@ -13,6 +13,7 @@
 export LVM_CLVMD_BINARY=clvmd
 export LVM_BINARY=lvm

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_CLVMD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/covercmd.sh
+++ b/test/shell/covercmd.sh
@ -14,6 +14,7 @@
 # to improve code coverage
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/discards-thin.sh
+++ b/test/shell/discards-thin.sh
@ -13,6 +13,7 @@
 # test support of thin discards
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/dmeventd-restart.sh
+++ b/test/shell/dmeventd-restart.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/dumpconfig.sh
+++ b/test/shell/dumpconfig.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/error-usage.sh
+++ b/test/shell/error-usage.sh
@ -11,6 +11,7 @@

 # Basic usage of zero target

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/fsadm.sh
+++ b/test/shell/fsadm.sh
@ -10,6 +10,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 test_description='Exercise fsadm filesystem resize'
+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/inconsistent-metadata.sh
+++ b/test/shell/inconsistent-metadata.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/listings.sh
+++ b/test/shell/listings.sh
@ -13,6 +13,7 @@
 # tests functionality of lvs, pvs, vgs, *display tools
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lock-blocking.sh
+++ b/test/shell/lock-blocking.sh
@ -10,6 +10,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 test_description='test some blocking / non-blocking multi-vg operations'
+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_CLVMD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lock-parallel.sh
+++ b/test/shell/lock-parallel.sh
@ -12,6 +12,7 @@
 # Test parallel use of lvm commands and check locks aren't dropped
 # RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1049296

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-cache-old.sh
+++ b/test/shell/lvchange-cache-old.sh
@ -11,6 +11,7 @@

 # Exercise usage of older metadata which are missing some new settings

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-cache.sh
+++ b/test/shell/lvchange-cache.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-mirror.sh
+++ b/test/shell/lvchange-mirror.sh
@ -11,6 +11,7 @@

 # FIXME RESYNC doesn't work in cluster with exclusive activation
 # seriously broken!
+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_CLVMD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvchange-partial-raid10.sh
+++ b/test/shell/lvchange-partial-raid10.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-partial.sh
+++ b/test/shell/lvchange-partial.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-raid.sh
+++ b/test/shell/lvchange-raid.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-syncaction-raid.sh
+++ b/test/shell/lvchange-syncaction-raid.sh
@ -11,6 +11,7 @@

 # test activation race for raid's --syncaction check

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvchange-thin.sh
+++ b/test/shell/lvchange-thin.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvconvert-cache-raid.sh
+++ b/test/shell/lvconvert-cache-raid.sh
@ -11,6 +11,7 @@

 # Exercise usage of stacked cache volume using raid volume

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-cache-smq.sh
+++ b/test/shell/lvconvert-cache-smq.sh
@ -11,6 +11,7 @@

 # Exercise conversion of cache and cache pool

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-cache-thin.sh
+++ b/test/shell/lvconvert-cache-thin.sh
@ -11,6 +11,7 @@

 # Exercise usage of stacked cache volume used in thin pool volumes

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-cache.sh
+++ b/test/shell/lvconvert-cache.sh
@ -11,6 +11,7 @@

 # Exercise conversion of cache and cache pool

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-mirror-basic.sh
+++ b/test/shell/lvconvert-mirror-basic.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 # disable lvmetad logging as it bogs down test systems
 export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}

--- a/test/shell/lvconvert-mirror-updown.sh
+++ b/test/shell/lvconvert-mirror-updown.sh
@ -11,6 +11,8 @@

 # Demonstrate problem when upconverting and cutting leg in clvmd

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_pvs 3
--- a/test/shell/lvconvert-mirror.sh
+++ b/test/shell/lvconvert-mirror.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 # disable lvmetad logging as it bogs down test systems
 export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}

--- a/test/shell/lvconvert-raid-allocation.sh
+++ b/test/shell/lvconvert-raid-allocation.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-raid.sh
+++ b/test/shell/lvconvert-raid.sh
@ -11,6 +11,7 @@

 # disable lvmetad logging as it bogs down test systems

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}
--- a/test/shell/lvconvert-raid10.sh
+++ b/test/shell/lvconvert-raid10.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-raid456.sh
+++ b/test/shell/lvconvert-raid456.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-dmeventd.sh
+++ b/test/shell/lvconvert-repair-dmeventd.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-policy.sh
+++ b/test/shell/lvconvert-repair-policy.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_vg 4
--- a/test/shell/lvconvert-repair-raid-dmeventd.sh
+++ b/test/shell/lvconvert-repair-raid-dmeventd.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-raid.sh
+++ b/test/shell/lvconvert-repair-raid.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-replace.sh
+++ b/test/shell/lvconvert-repair-replace.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_vg 6
--- a/test/shell/lvconvert-repair-snapshot.sh
+++ b/test/shell/lvconvert-repair-snapshot.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-thin-raid.sh
+++ b/test/shell/lvconvert-repair-thin-raid.sh
@ -12,6 +12,7 @@

 # Test repairing of broken thin pool on raid

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-thin.sh
+++ b/test/shell/lvconvert-repair-thin.sh
@ -12,6 +12,7 @@

 # Test repairing of broken thin pool metadata

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-transient-dmeventd.sh
+++ b/test/shell/lvconvert-repair-transient-dmeventd.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair-transient.sh
+++ b/test/shell/lvconvert-repair-transient.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-repair.sh
+++ b/test/shell/lvconvert-repair.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 recreate_vg_()
--- a/test/shell/lvconvert-snapshot.sh
+++ b/test/shell/lvconvert-snapshot.sh
@ -12,6 +12,7 @@

 # Test various supported conversion of snapshot

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvconvert-thin-external.sh
+++ b/test/shell/lvconvert-thin-external.sh
@ -12,6 +12,7 @@

 # Test conversion to thin external origin

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvconvert-thin-raid.sh
+++ b/test/shell/lvconvert-thin-raid.sh
@ -10,6 +10,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@ -10,6 +10,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvconvert-twostep.sh
+++ b/test/shell/lvconvert-twostep.sh
@ -9,6 +9,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_vg 4
--- a/test/shell/lvcreate-cache-raid.sh
+++ b/test/shell/lvcreate-cache-raid.sh
@ -11,6 +11,7 @@

 # Exercise creation of cache and raids

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-cache.sh
+++ b/test/shell/lvcreate-cache.sh
@ -14,6 +14,7 @@
 # Full CLI uses  --type
 # Shorthand CLI uses -H | --cache

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-large-raid.sh
+++ b/test/shell/lvcreate-large-raid.sh
@ -11,6 +11,7 @@

 # 'Exercise some lvcreate diagnostics'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-large-raid10.sh
+++ b/test/shell/lvcreate-large-raid10.sh
@ -11,6 +11,7 @@

 # 'Exercise some lvcreate diagnostics'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-large.sh
+++ b/test/shell/lvcreate-large.sh
@ -11,6 +11,7 @@

 # 'Exercise some lvcreate diagnostics'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-mirror.sh
+++ b/test/shell/lvcreate-mirror.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-missing.sh
+++ b/test/shell/lvcreate-missing.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-operation.sh
+++ b/test/shell/lvcreate-operation.sh
@ -11,6 +11,7 @@

 # 'Exercise some lvcreate diagnostics'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-pvtags.sh
+++ b/test/shell/lvcreate-pvtags.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-raid.sh
+++ b/test/shell/lvcreate-raid.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-raid10.sh
+++ b/test/shell/lvcreate-raid10.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-repair.sh
+++ b/test/shell/lvcreate-repair.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-signature-wiping.sh
+++ b/test/shell/lvcreate-signature-wiping.sh
@ -11,6 +11,7 @@

 # 'Exercise signature wiping during lvcreate'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-small-snap.sh
+++ b/test/shell/lvcreate-small-snap.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-striped-mirror.sh
+++ b/test/shell/lvcreate-striped-mirror.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvcreate-thin-big.sh
+++ b/test/shell/lvcreate-thin-big.sh
@ -13,6 +13,7 @@
 # test currently needs to drop
 # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-thin-external-size.sh
+++ b/test/shell/lvcreate-thin-external-size.sh
@ -12,6 +12,7 @@

 # Test unaligned size of external origin and thin pool chunk size

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-thin-external.sh
+++ b/test/shell/lvcreate-thin-external.sh
@ -12,6 +12,7 @@

 # Test creation of thin snapshots using external origin

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-thin-power2.sh
+++ b/test/shell/lvcreate-thin-power2.sh
@ -13,6 +13,7 @@
 # test support for non-power-of-2 thin chunk size
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-thin-snap.sh
+++ b/test/shell/lvcreate-thin-snap.sh
@ -10,6 +10,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-thin.sh
+++ b/test/shell/lvcreate-thin.sh
@ -13,6 +13,7 @@
 # test currently needs to drop
 # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvcreate-usage.sh
+++ b/test/shell/lvcreate-usage.sh
@ -11,6 +11,8 @@

 # 'Exercise some lvcreate diagnostics'

+SKIP_WITH_LVMLOCKD=1
+
 . lib/inittest

 aux prepare_pvs 4
--- a/test/shell/lvextend-percent-extents.sh
+++ b/test/shell/lvextend-percent-extents.sh
@ -11,6 +11,7 @@

 # 'Check extents percentage arguments'

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvextend-snapshot-dmeventd.sh
+++ b/test/shell/lvextend-snapshot-dmeventd.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvextend-snapshot-policy.sh
+++ b/test/shell/lvextend-snapshot-policy.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvextend-thin-data-dmeventd.sh
+++ b/test/shell/lvextend-thin-data-dmeventd.sh
@ -11,6 +11,7 @@

 # Test autoextension of thin data volume

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvextend-thin-full.sh
+++ b/test/shell/lvextend-thin-full.sh
@ -13,6 +13,7 @@
 # play with thin-pool resize in corner cases
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvextend-thin-metadata-dmeventd.sh
+++ b/test/shell/lvextend-thin-metadata-dmeventd.sh
@ -11,6 +11,7 @@

 # Test autoextension of thin metadata volume

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvextend-thin.sh
+++ b/test/shell/lvextend-thin.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
--- a/test/shell/lvm-init.sh
+++ b/test/shell/lvm-init.sh
@ -13,6 +13,7 @@
 # tests lvm initialization, and especially negative tests of error paths
 #

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvmcache-exercise.sh
+++ b/test/shell/lvmcache-exercise.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITH_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvmetad-ambiguous.sh
+++ b/test/shell/lvmetad-ambiguous.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-autoshutdown.sh
+++ b/test/shell/lvmetad-autoshutdown.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-client-filter.sh
+++ b/test/shell/lvmetad-client-filter.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-disabled.sh
+++ b/test/shell/lvmetad-disabled.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-dump.sh
+++ b/test/shell/lvmetad-dump.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-lvm1.sh
+++ b/test/shell/lvmetad-lvm1.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-lvscan-cache.sh
+++ b/test/shell/lvmetad-lvscan-cache.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-no-cluster.sh
+++ b/test/shell/lvmetad-no-cluster.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_CLVMD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-override.sh
+++ b/test/shell/lvmetad-override.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-pvs.sh
+++ b/test/shell/lvmetad-pvs.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMPOLLD=1

 . lib/inittest
--- a/test/shell/lvmetad-pvscan-autoactivation-polling.sh
+++ b/test/shell/lvmetad-pvscan-autoactivation-polling.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1

 . lib/inittest
--- a/test/shell/lvmetad-pvscan-cache.sh
+++ b/test/shell/lvmetad-pvscan-cache.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/test/shell/lvmetad-pvscan-filter.sh
+++ b/test/shell/lvmetad-pvscan-filter.sh
@ -9,6 +9,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+SKIP_WITH_LVMLOCKD=1
 SKIP_WITHOUT_LVMETAD=1
 SKIP_WITH_LVMPOLLD=1

--- a/Show More
+++ b/Show More