[lvm-devel] master - test: additional avoid have_raid overhead

[Alasdair Kergon]

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7a5728fb4c748b911f829c5cda0768c6289a4512
Commit:        7a5728fb4c748b911f829c5cda0768c6289a4512
Parent:        97750cd12f2ae47d12881a9c8ee655b4bfb52737
Author:        Heinz Mauelshagen <heinzm at redhat.com>
AuthorDate:    Tue Nov 14 14:17:54 2017 +0100
Committer:     Alasdair G Kergon <agk at redhat.com>
CommitterDate: Tue Nov 14 14:41:44 2017 +0000

test: additional avoid have_raid overhead

---
 test/shell/lvcreate-large-raid.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/shell/lvcreate-large-raid.sh b/test/shell/lvcreate-large-raid.sh
index 1082731..3488db4 100644
--- a/test/shell/lvcreate-large-raid.sh
+++ b/test/shell/lvcreate-large-raid.sh
@@ -21,6 +21,8 @@ SKIP_WITH_LVMPOLLD=1
 aux can_use_16T || skip
 
 aux have_raid 1 3 0 || skip
+v1_9_0=0
+aux have_raid 1 9 0 && v1_9_0=1
 
 segtypes="raid5"
 aux have_raid4 && segtypes="raid4 raid5"
@@ -78,7 +80,7 @@ lvremove -ff $vg1
 
 
 # Check --nosync is rejected for raid6
-if aux have_raid 1 9 0 ; then
+if [ $v1_9_0 -eq 1 ] ; then
 	not lvcreate --type raid6 -i 3 -L 750T -n $lv1 $vg1 --nosync
 fi
 
@@ -103,7 +105,7 @@ lvremove -ff $vg1
 lvcreate -aey -L 200T -n $lv1 $vg1
 lvconvert -y --type raid1 -m 1 $vg1/$lv1
 check lv_field $vg1/$lv1 size "200.00t"
-if aux have_raid 1 9 0; then
+if [ $v1_9_0 -eq 1 ] ; then
 	# The 1.9.0 version of dm-raid is capable of performing
 	# linear -> RAID1 upconverts as "recover" not "resync"
 	# The LVM code now checks the dm-raid version when