From: NeilBrown <neilb@suse.de>
Date: Tue, 21 Jul 2015 23:58:41 +0000 (+1000)
Subject: test: add -F flag to mkfs
X-Git-Tag: mdadm-3.3.3~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d51e39c0a42c799088b39d16ede01f95345d7675;p=thirdparty%2Fmdadm.git

test: add -F flag to mkfs

newer versions of mkfs.extX ask before creating a filesystem
on a device which appears to already have a filesystem.
We don't want that, so add the -F flag.
Also be explicit about fs type as one shouldn't depend on defaults.

Signed-off-by: NeilBrown <neilb@suse.com>
---

diff --git a/test b/test
index cec057c2..939410ce 100755
--- a/test
+++ b/test
@@ -256,7 +256,7 @@ testdev() {
    dvsize=$3
    chunk=$4
    if [ -z "$5" ]; then
-      mkfs -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2
+      mkfs.ext3 -F -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2
    fi
    dsize=$[dvsize/chunk]
    dsize=$[dsize*chunk]
diff --git a/tests/10ddf-fail-readd b/tests/10ddf-fail-readd
index 411d35b2..9cd78937 100644
--- a/tests/10ddf-fail-readd
+++ b/tests/10ddf-fail-readd
@@ -10,7 +10,7 @@ mdadm -CR $container -e ddf -l container -n 2 $dev8 $dev9
 mdadm -CR $member0 -l raid1 -n 2 $container
 #$dir/mdadm -CR $member0 -l raid1 -n 2 $container >/tmp/mdmon.txt 2>&1
 
-mke2fs $member0
+mke2fs -F $member0
 check wait
 
 set -- $(get_raiddisks $member0)
diff --git a/tests/10ddf-fail-stop-readd b/tests/10ddf-fail-stop-readd
index 34aeaf50..f8ebe176 100644
--- a/tests/10ddf-fail-stop-readd
+++ b/tests/10ddf-fail-stop-readd
@@ -11,7 +11,7 @@ mdadm -CR $member0 -l raid1 -n 2 $container
 #$dir/mdadm -CR $member0 -l raid1 -n 2 $container >/tmp/mdmon.txt 2>&1
 
 # Write to the array
-mke2fs $member0
+mke2fs -F $member0
 check wait
 
 set -- $(get_raiddisks $member0)
@@ -33,7 +33,7 @@ mdadm -I $good0
 mdadm -IRs || true
 
 # Write to the array
-mke2fs $member0
+mke2fs -F $member0
 
 # We re-add the disk now
 mdadm $container --add $fail0
diff --git a/tests/10ddf-incremental-wrong-order b/tests/10ddf-incremental-wrong-order
index 1c088c11..9ecf6bc2 100644
--- a/tests/10ddf-incremental-wrong-order
+++ b/tests/10ddf-incremental-wrong-order
@@ -17,8 +17,8 @@ mdadm -CR $member0 -n 2 -l 1 $dev8 $dev9 -z 10000
 mdadm --wait $member0 || true
 mdadm --wait $member1 || true
 
-mke2fs $member0
-mke2fs $member1
+mke2fs -F $member0
+mke2fs -F $member1
 sha_0a=$(sha1_sum $member0)
 sha_1a=$(sha1_sum $member1)