diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2013-11-19 11:47:28 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2013-11-19 11:49:33 +0100 |
| commit | b0b061cdbc4856cf6f5b43bd9ae835e678440890 (patch) | |
| tree | 40c6c6f578c3899f2f690cc4357e5b26996125cd | |
| parent | fe609141a894d33b92a6eb5fb9b5ee62bdc6c4ee (diff) | |
| download | lvm2-b0b061cdbc4856cf6f5b43bd9ae835e678440890.tar.gz | |
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.
| -rw-r--r-- | test/lib/aux.sh | 6 | ||||
| -rw-r--r-- | test/shell/lvconvert-raid.sh | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 6f21e8b71..4ef11324d 100644 --- 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 680710e98..0bdb02396 100644 --- 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 |