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>

diff --git a/tests/10ddf-create b/tests/10ddf-create
index db22b64f2b4bdbe2c0f8e89463a1e7de4df90215..a32dc0f54aaf53dd375836824498be686ca634a5 100644 (file)
--- 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