test: Comment out incorrect lockd setup

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 5911eafc1d8d1566894cf5a0d2e59c3def95d736..021eb8155e94856cbb07dd26ba59669aa7a57f46 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -108,9 +108,6 @@ prepare_sanlock() {
        fi
 }
 
-# FIXME: add option to allow --test with sanlock
-LVM_TEST_LVMLOCKD_TEST_DLM=1
-
 prepare_lvmlockd() {
        if pgrep lvmlockd ; then
                echo "Cannot run while existing lvmlockd process exists"
@@ -965,8 +962,9 @@ generate_config() {
        LVM_TEST_LVMETAD=${LVM_TEST_LVMETAD:-0}
        LVM_TEST_LVMPOLLD=${LVM_TEST_LVMPOLLD:-0}
        LVM_TEST_LVMLOCKD=${LVM_TEST_LVMLOCKD:-0}
-       LVM_TEST_LOCK_TYPE_SANLOCK=${LVM_TEST_LOCK_TYPE_SANLOCK:-0}
-       LVM_TEST_LOCK_TYPE_DLM=${LVM_TEST_LOCK_TYPE_DLM:-0}
+        # FIXME:dct: This is harmful! Variables are unused here and are tested not being empty elsewhere:
+       #LVM_TEST_LOCK_TYPE_SANLOCK=${LVM_TEST_LOCK_TYPE_SANLOCK:-0}
+       #LVM_TEST_LOCK_TYPE_DLM=${LVM_TEST_LOCK_TYPE_DLM:-0}
        if test "$DM_DEV_DIR" = "/dev"; then
            LVM_VERIFY_UDEV=${LVM_VERIFY_UDEV:-0}
        else

diff --git a/test/lib/flavour-udev-lvmlockd-test.sh b/test/lib/flavour-udev-lvmlockd-test.sh
index 60b67b1a89778d05964ada8db26960c6f0ce9cfd..17ef5169e22e743b64545d8e9f9833fd6e77d27d 100644 (file)
--- a/test/lib/flavour-udev-lvmlockd-test.sh
+++ b/test/lib/flavour-udev-lvmlockd-test.sh
@@ -4,3 +4,6 @@ export LVM_TEST_LVMPOLLD=1
 export LVM_TEST_LVMLOCKD=1
 export LVM_TEST_LVMLOCKD_TEST=1
 export LVM_TEST_DEVDIR=/dev
+
+# FIXME:dct: add option to allow --test with sanlock
+LVM_TEST_LVMLOCKD_TEST_DLM=1