diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2016-03-09 10:56:39 +0100 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2016-03-09 10:58:21 +0100 |
| commit | cb968ee875a232c8ca19c6277c0fcb223cbed93b (patch) | |
| tree | b57480785a2a7056908e92003cd6b17b4b7e91ae | |
| parent | c6e1845f769851edbfeb88105ec37e9fe5ad3424 (diff) | |
| download | lvm2-cb968ee875a232c8ca19c6277c0fcb223cbed93b.tar.gz | |
test: Comment out incorrect lockd setup
| -rw-r--r-- | test/lib/aux.sh | 8 | ||||
| -rw-r--r-- | test/lib/flavour-udev-lvmlockd-test.sh | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 5911eafc1..021eb8155 100644 --- 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 60b67b1a8..17ef5169e 100644 --- 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 |