diff options
| author | NeilBrown <neilb@suse.de> | 2009-10-19 16:58:38 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-10-19 16:58:38 +1100 |
| commit | 00eb571675b431b3845c67abba891a198cef06f3 (patch) | |
| tree | c9d1c6ba3f8afb5a07ae7e10fe8a7088543de3de /tests | |
| parent | 453e3b41d0bd823bfc3137ce5c2738d02fc2ffe2 (diff) | |
| download | mdadm-00eb571675b431b3845c67abba891a198cef06f3.tar.gz mdadm-00eb571675b431b3845c67abba891a198cef06f3.tar.xz mdadm-00eb571675b431b3845c67abba891a198cef06f3.zip | |
test/ddf: don't insist that mdadm.conf is always in the same order.
When created by different process, the order could reasonably
be different. So sort before compare
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/10ddf-create | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/10ddf-create b/tests/10ddf-create index db22b64..a32dc0f 100644 --- a/tests/10ddf-create +++ b/tests/10ddf-create @@ -55,8 +55,8 @@ mdadm -Ss mdadm -Asc /var/tmp/mdadm.conf check nosync # This failed once. The raid5 was resyncing. -mdadm -Dbs > /tmp/mdadm.conf -diff /tmp/mdadm.conf /var/tmp/mdadm.conf +mdadm -Dbs | sort > /tmp/mdadm.conf +sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf - mdadm -Ss # and now assemble fully incrementally. @@ -70,7 +70,7 @@ do done check nosync -mdadm -Dbs > /tmp/mdadm.conf -diff /tmp/mdadm.conf /var/tmp/mdadm.conf +mdadm -Dbs | sort > /tmp/mdadm.conf +sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf - mdadm -Ss rm /tmp/mdadm.conf /var/tmp/mdadm.conf |