From 8c998ebbede26b4a6ae7c792f28f712ece7722ea Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 12 May 2010 13:15:38 +0000 Subject: [PATCH] Chop up the big t-lvconvert-mirror-basic loop across 4 separate test scripts (and use sourcing to avoid code duplication). --- test/t-lvconvert-mirror-basic-0.sh | 2 ++ test/t-lvconvert-mirror-basic-1.sh | 2 ++ test/t-lvconvert-mirror-basic-2.sh | 2 ++ test/t-lvconvert-mirror-basic-3.sh | 2 ++ test/t-lvconvert-mirror-basic.sh | 9 ++++----- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 test/t-lvconvert-mirror-basic-0.sh create mode 100644 test/t-lvconvert-mirror-basic-1.sh create mode 100644 test/t-lvconvert-mirror-basic-2.sh create mode 100644 test/t-lvconvert-mirror-basic-3.sh diff --git a/test/t-lvconvert-mirror-basic-0.sh b/test/t-lvconvert-mirror-basic-0.sh new file mode 100644 index 000000000..2886cf5fd --- /dev/null +++ b/test/t-lvconvert-mirror-basic-0.sh @@ -0,0 +1,2 @@ +. ./t-lvconvert-mirror-basic.sh +test_many 0 diff --git a/test/t-lvconvert-mirror-basic-1.sh b/test/t-lvconvert-mirror-basic-1.sh new file mode 100644 index 000000000..ff516f357 --- /dev/null +++ b/test/t-lvconvert-mirror-basic-1.sh @@ -0,0 +1,2 @@ +. ./t-lvconvert-mirror-basic.sh +test_many 1 diff --git a/test/t-lvconvert-mirror-basic-2.sh b/test/t-lvconvert-mirror-basic-2.sh new file mode 100644 index 000000000..2b82cd105 --- /dev/null +++ b/test/t-lvconvert-mirror-basic-2.sh @@ -0,0 +1,2 @@ +. ./t-lvconvert-mirror-basic.sh +test_many 2 diff --git a/test/t-lvconvert-mirror-basic-3.sh b/test/t-lvconvert-mirror-basic-3.sh new file mode 100644 index 000000000..806ade070 --- /dev/null +++ b/test/t-lvconvert-mirror-basic-3.sh @@ -0,0 +1,2 @@ +. ./t-lvconvert-mirror-basic.sh +test_many 3 diff --git a/test/t-lvconvert-mirror-basic.sh b/test/t-lvconvert-mirror-basic.sh index bdcc01463..c6e251f04 100644 --- a/test/t-lvconvert-mirror-basic.sh +++ b/test/t-lvconvert-mirror-basic.sh @@ -121,9 +121,9 @@ test_lvconvert() aux prepare_vg 5 -# Test conversion combinations from linear <-> 4-way mirrors -for i in $(seq 0 4); do - for j in $(seq 0 4); do +test_many() { + i=$1 + for j in $(seq 0 3); do for k in core disk mirrored; do for l in core disk mirrored; do if test "$i" -eq "$j" && test "$k" = "$l"; then continue; fi @@ -135,5 +135,4 @@ for i in $(seq 0 4); do done done done -done - +} -- 2.43.5