From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Wed, 10 Oct 2012 12:57:02 +0000 (+0200)
Subject: test: move common code for thin init
X-Git-Tag: v2_02_98~69
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d4eded9fd6686310ea653da889f40dbe8358f244;p=lvm2.git

test: move common code for thin init
---

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index d972d10f6..f179e313e 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -534,6 +534,9 @@ have_thin()
 {
     target_at_least dm-thin-pool "$@" || exit 1
     test "$THIN" = shared || test "$THIN" = internal || exit 1
+
+# disable thin_check if not present in system
+    which thin_check || lvmconf 'global/thin_check_executable = ""'
 }
 
 test -f DEVICES && devs=$(cat DEVICES)
diff --git a/test/shell/discards-thin.sh b/test/shell/discards-thin.sh
index ec3bd1f8b..4aa429344 100644
--- a/test/shell/discards-thin.sh
+++ b/test/shell/discards-thin.sh
@@ -22,9 +22,6 @@ aux have_thin 1 1 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 
diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
index abaa620cb..32661cdd7 100644
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@@ -19,9 +19,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 4 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 
diff --git a/test/shell/lvcreate-thin-snap.sh b/test/shell/lvcreate-thin-snap.sh
index 2ee8748eb..18846e35f 100644
--- a/test/shell/lvcreate-thin-snap.sh
+++ b/test/shell/lvcreate-thin-snap.sh
@@ -30,9 +30,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"
 
diff --git a/test/shell/lvcreate-thin.sh b/test/shell/lvcreate-thin.sh
index 7ba97ed0e..8ad552b72 100644
--- a/test/shell/lvcreate-thin.sh
+++ b/test/shell/lvcreate-thin.sh
@@ -33,9 +33,6 @@ aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 2 64
 
-# disable thin_check if not present in system
-which thin_check || aux lvmconf 'global/thin_check_executable = ""'
-
 clustered=
 test -e LOCAL_CLVMD && clustered="--clustered y"