LU-2393 tests: conf-sanity/32b ensure uniform sort ordering

Different hosts can have different locales (sles vs. rhel), so do all
sorts on a single node to ensure uniform ordering.

Test-Parameters: clientdistro=sles11sp2 testlist=conf-sanity

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I9b10b8d482add2ac18f0fa51f8ec995c06e52cec
Reviewed-on: http://review.whamcloud.com/4685
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 723fa90..c9dde57 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1481,7 +1481,9 @@ t32_test() {
                $LCTL set_param debug="$PTLDEBUG"
 
                if $r test -f $tmp/sha1sums; then
-                       $r sort -k 2 $tmp/sha1sums >$tmp/sha1sums.orig
+                       # LU-2393 - do both sorts on same node to ensure locale
+                       # is identical
+                       $r cat $tmp/sha1sums | sort -k 2 >$tmp/sha1sums.orig
                        pushd $tmp/mnt/lustre
                        find ! -name .lustre -type f -exec sha1sum {} \; |
                                sort -k 2 >$tmp/sha1sums || {
@@ -1502,7 +1504,9 @@ t32_test() {
                        # There is not a Test Framework API to copy files to or
                        # from a remote node.
                        #
-                       $r sort -k 6 $tmp/list >$tmp/list.orig
+                       # LU-2393 - do both sorts on same node to ensure locale
+                       # is identical
+                       $r cat $tmp/list | sort -k 6 >$tmp/list.orig
                        pushd $tmp/mnt/lustre
                        ls -Rni --time-style=+%s | sort -k 6 >$tmp/list || {
                                error_noexit "ls"