From 637b7bca5e06c27a402fc4b4c51bb833e3b8a785 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Tue, 27 Nov 2012 12:58:53 -0500 Subject: [PATCH] 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 Change-Id: I9b10b8d482add2ac18f0fa51f8ec995c06e52cec Reviewed-on: http://review.whamcloud.com/4685 Reviewed-by: Bob Glossman Tested-by: Hudson Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 723fa90..c9dde57 100644 --- 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" -- 1.8.3.1