tests: skip raid test on 3.12.0

3.12.0 kernel prevents raid test to be usable,
leaving unremovable devices in table.

This needs to be fixed ASAP, meanwhile disable test to make
test machines at least usable.

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 6f21e8b71c77c5cd55058ce4fda1e5f8c6a5434b..4ef11324d2294dff3acf85bd8274f2a1a31db953 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -689,6 +689,12 @@ target_at_least()
          dm-*) modprobe "$1" || true ;;
        esac
 
+       if test "$1" = dm-raid; then
+               case "$(uname -r)" in
+                 3.12.0*) return 1 ;;
+               esac
+       fi
+
        local version=$(dmsetup targets 2>/dev/null | grep "${1##dm-} " 2>/dev/null)
        version=${version##* v}
        shift

diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh
index 680710e984d50da5f1b76f2bf53f6cc9bd1946d9..0bdb023963a61b9d69191c7f905a7ad66dcd054f 100644 (file)
--- a/test/shell/lvconvert-raid.sh
+++ b/test/shell/lvconvert-raid.sh
@@ -22,10 +22,7 @@ get_image_pvs() {
 ########################################################
 # MAIN
 ########################################################
-if ! aux target_at_least dm-raid 1 2 0; then
-       dmsetup targets | grep raid
-       skip
-fi
+aux target_at_least dm-raid 1 2 0 || skip
 
 # 9 PVs needed for RAID10 testing (3-stripes/2-mirror - replacing 3 devs)
 aux prepare_pvs 9 80