diff options
| author | David Teigland <teigland@redhat.com> | 2015-07-02 10:57:22 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-07-02 10:57:22 -0500 |
| commit | 2144e791acbc3a7fe81ed754f83c6e89ba179f67 (patch) | |
| tree | 54366d870c8cd089f828a68344cafcc8783d45bb | |
| parent | 9eab3fe140d4f640ab1b7fa748750686cf6ce7c8 (diff) | |
| download | lvm2-2144e791acbc3a7fe81ed754f83c6e89ba179f67.tar.gz | |
test suite: set dev size large when using sanlock
| -rw-r--r-- | test/lib/aux.sh | 6 | ||||
| -rw-r--r-- | test/shell/dlm-hello-world.sh | 2 | ||||
| -rw-r--r-- | test/shell/process-each-lv.sh | 2 | ||||
| -rw-r--r-- | test/shell/process-each-vg.sh | 2 | ||||
| -rw-r--r-- | test/shell/sanlock-hello-world.sh | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 55508439f..459e7f13c 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -542,6 +542,12 @@ prepare_devs() { local pvname=${3:-pv} local shift=0 + # sanlock requires more space for the internal sanlock lv + # This could probably be lower, but what are the units? + if test -n "$LVM_TEST_LOCK_TYPE_SANLOCK" ; then + devsize = 1024 + fi + touch DEVICES prepare_backing_dev $(($n*$devsize)) # shift start of PV devices on /dev/loopXX by 1M diff --git a/test/shell/dlm-hello-world.sh b/test/shell/dlm-hello-world.sh index a1d6925fa..3f5fc5701 100644 --- a/test/shell/dlm-hello-world.sh +++ b/test/shell/dlm-hello-world.sh @@ -15,7 +15,7 @@ test_description='Hello world for vgcreate with lvmlockd and dlm' [ -z "$LVM_TEST_LOCK_TYPE_DLM" ] && skip; -aux prepare_devs 1 1024 +aux prepare_devs 1 vgcreate $SHARED $vg "$dev1" diff --git a/test/shell/process-each-lv.sh b/test/shell/process-each-lv.sh index fca7a6d76..52c97d4da 100644 --- a/test/shell/process-each-lv.sh +++ b/test/shell/process-each-lv.sh @@ -16,7 +16,7 @@ export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-} . lib/inittest -aux prepare_devs 10 1024 +aux prepare_devs 10 # # process_each_lv is used by a number of lv commands: diff --git a/test/shell/process-each-vg.sh b/test/shell/process-each-vg.sh index 0dca90434..49bc4f91b 100644 --- a/test/shell/process-each-vg.sh +++ b/test/shell/process-each-vg.sh @@ -13,7 +13,7 @@ test_description='Exercise toollib process_each_vg' . lib/inittest -aux prepare_devs 6 1024 +aux prepare_devs 6 # # process_each_vg is used by a number of vg commands; diff --git a/test/shell/sanlock-hello-world.sh b/test/shell/sanlock-hello-world.sh index ab08ba1c8..23cdc3434 100644 --- a/test/shell/sanlock-hello-world.sh +++ b/test/shell/sanlock-hello-world.sh @@ -15,7 +15,7 @@ test_description='Hello world for vgcreate with lvmlockd and sanlock' [ -z "$LVM_TEST_LOCK_TYPE_SANLOCK" ] && skip; -aux prepare_pvs 1 1024 +aux prepare_pvs 1 vgcreate $SHARED $vg "$dev1" |