Fix but when assembling v1 arrays

Because raid_disk and disk.number are not longer in-sync,
it needed some work.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>

15 files changed, 0 insertions, 15 deletions

diff --git a/tests/00raid1 b/tests/00raid1
index 01e4241c..af40da4c 100644
--- a/tests/00raid1
+++ b/tests/00raid1
@@ -2,7 +2,6 @@
 # create a simple mirror
 # test version0, version1, and no super
 # test resync and recovery.
-set -e
 
 mdadm -CR $md0 -l 1 -n2 $dev0 $dev1 
 check resync
diff --git a/tests/00raid10 b/tests/00raid10
index fe781baf..6fffb741 100644
--- a/tests/00raid10
+++ b/tests/00raid10
@@ -1,4 +1,3 @@
-set -ex
 
 # Create some raid10 arrays, all with 6 devices and one spare
 devs="$dev0 $dev1 $dev2 $dev3 $dev4 $dev5 $dev6"
diff --git a/tests/01r5fail b/tests/01r5fail
index 5c76a0bb..89cd5615 100644
--- a/tests/01r5fail
+++ b/tests/01r5fail
@@ -1,5 +1,4 @@
 
-set -e
 
 # create a raid5, fail and remove a drive during initial sync
 # Add two more, fail and remove one
diff --git a/tests/02r1add b/tests/02r1add
index 6b2b212d..c07ec977 100644
--- a/tests/02r1add
+++ b/tests/02r1add
@@ -1,5 +1,4 @@
 
-set -e
 # Make a raid1,  add a device, then remove it again.
 
 mdadm -CR $md0 -l1 -n2 -x1 $dev0 $dev1 $dev2  
diff --git a/tests/02r1grow b/tests/02r1grow
index e789707f..e187b0ae 100644
--- a/tests/02r1grow
+++ b/tests/02r1grow
@@ -1,5 +1,4 @@
 
-set -e
 
 # create a small raid1 array, make it larger.  Then make it smaller
 
diff --git a/tests/02r5grow b/tests/02r5grow
index b8de3d4c..47bc83eb 100644
--- a/tests/02r5grow
+++ b/tests/02r5grow
@@ -1,5 +1,4 @@
 
-set -e
 
 # create a small raid5 array, make it larger.  Then make it smaller
 
diff --git a/tests/02r6grow b/tests/02r6grow
index 6f4cce2e..897f510c 100644
--- a/tests/02r6grow
+++ b/tests/02r6grow
@@ -1,5 +1,4 @@
 
-set -e
 
 # create a small raid6 array, make it larger.  Then make it smaller
 
diff --git a/tests/03r5assem b/tests/03r5assem
index b2b06986..be26cf15 100644
--- a/tests/03r5assem
+++ b/tests/03r5assem
@@ -1,4 +1,3 @@
-set -e
 
 # create a raid5 array and assemble it in various ways,
 # including with missing devices.
diff --git a/tests/04r0update b/tests/04r0update
index 2a6939df..23c7d656 100644
--- a/tests/04r0update
+++ b/tests/04r0update
@@ -1,4 +1,3 @@
-set -e
 
 # create a raid0, re-assemble with a different super-minor
 mdadm -CR $md0 -l0 -n3 $dev0 $dev1 $dev2 
diff --git a/tests/05r1-bitmapfile b/tests/05r1-bitmapfile
index ac952c23..d2275763 100644
--- a/tests/05r1-bitmapfile
+++ b/tests/05r1-bitmapfile
@@ -1,4 +1,3 @@
-set -e
 
 # 
 # create a raid1 with a bitmap file
diff --git a/tests/05r1-grow-external b/tests/05r1-grow-external
index 072dc3cc..ba9b3e59 100644
--- a/tests/05r1-grow-external
+++ b/tests/05r1-grow-external
@@ -1,4 +1,3 @@
-set -e
 
 #
 # create a raid1 array, add an external bitmap
diff --git a/tests/05r1-internalbitmap b/tests/05r1-internalbitmap
index 0f8a43a5..19549c50 100644
--- a/tests/05r1-internalbitmap
+++ b/tests/05r1-internalbitmap
@@ -1,4 +1,3 @@
-set -e
 
 # 
 # create a raid1 with an internal bitmap
diff --git a/tests/05r1-n3-bitmapfile b/tests/05r1-n3-bitmapfile
index ec72decd..a76a9192 100644
--- a/tests/05r1-n3-bitmapfile
+++ b/tests/05r1-n3-bitmapfile
@@ -1,4 +1,3 @@
-set -e
 
 # 
 # create a raid1 with 3 devices and a bitmap file
diff --git a/tests/06r5swap b/tests/06r5swap
index e3aaa64b..41e8be68 100644
--- a/tests/06r5swap
+++ b/tests/06r5swap
@@ -1,4 +1,3 @@
-set -e
 
 # make a raid5 array, byte swap the superblocks, then assemble...
 
diff --git a/tests/06wrmostly b/tests/06wrmostly
index 929610cc..34be60d4 100644
--- a/tests/06wrmostly
+++ b/tests/06wrmostly
@@ -1,4 +1,3 @@
-set -e
 
 # create a raid1 array with a wrmostly device