tests: skip some without wipefs

diff --git a/test/shell/allow-mixed-block-sizes.sh b/test/shell/allow-mixed-block-sizes.sh
index 2f0b3a0656a0834a444a249c5cf67f97e71a2c07..ec60bc613eeedc28c636babf68642450876350bb 100644 (file)
--- a/test/shell/allow-mixed-block-sizes.sh
+++ b/test/shell/allow-mixed-block-sizes.sh
@@ -15,6 +15,7 @@ SKIP_WITH_LVMPOLLD=1
 . lib/inittest
 
 losetup -h | grep sector-size || skip
+wipefs -V || skip
 
 dd if=/dev/zero of=loopa bs=$((1024*1024)) count=2 2> /dev/null
 dd if=/dev/zero of=loopb bs=$((1024*1024)) count=2 2> /dev/null

diff --git a/test/shell/duplicate-pvs-md0.sh b/test/shell/duplicate-pvs-md0.sh
index 4c7863dd0a6e87c996d529bf4ea8cd4e25be08c4..d64da4affe2c6a9c2bccc90ad9a8844e7d43e909 100644 (file)
--- a/test/shell/duplicate-pvs-md0.sh
+++ b/test/shell/duplicate-pvs-md0.sh
@@ -28,6 +28,8 @@ _clear_online_files() {
 
 . lib/inittest
 
+wipefs -V || skip
+
 test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
         modprobe raid0 || skip
 not grep md0 /proc/mdstat

diff --git a/test/shell/duplicate-pvs-md1.sh b/test/shell/duplicate-pvs-md1.sh
index d242e03829d7c260fa4c5f0616d21da8a1cc0bcf..d186c0f703d1a27d4d929d5f685bda7b3e882461 100644 (file)
--- a/test/shell/duplicate-pvs-md1.sh
+++ b/test/shell/duplicate-pvs-md1.sh
@@ -33,6 +33,8 @@ _clear_online_files() {
 
 . lib/inittest
 
+wipefs -V || skip
+
 test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \
         modprobe raid1 || skip
 not grep md0 /proc/mdstat

diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh
index 68621011170bdb166076533bd8fa0a9fe91446da..7bcc276c17168ed17eb7ba2f3dd3dad712ef054f 100644 (file)
--- a/test/shell/lvm-on-md.sh
+++ b/test/shell/lvm-on-md.sh
@@ -28,6 +28,8 @@ _clear_online_files() {
 
 . lib/inittest
 
+wipefs -V || skip
+
 test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \
        modprobe raid1 || skip
 not grep md0 /proc/mdstat

diff --git a/test/shell/pvcreate-operation-md.sh b/test/shell/pvcreate-operation-md.sh
index 12cf8911afda41bbd3ad427ca54f73f6af4067af..1774d235c8e2391f7e160202a58595724445b321 100644 (file)
--- a/test/shell/pvcreate-operation-md.sh
+++ b/test/shell/pvcreate-operation-md.sh
@@ -18,6 +18,8 @@ SKIP_WITH_LVMPOLLD=1
 # skip this test if mdadm or sfdisk (or others) aren't available
 which sfdisk || skip
 
+wipefs -V || skip
+
 test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \
        modprobe raid0 || skip
 not grep md0 /proc/mdstat