From 8e1691ebbd3215f8586b90e404124f621518bc63 Mon Sep 17 00:00:00 2001 From: grev Date: Thu, 14 Feb 2008 00:54:21 +0000 Subject: [PATCH] b=13726 i=Adilger fix locale for tests where exact output is required --- lustre/tests/recovery-small.sh | 6 +++--- lustre/tests/sanity.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 6f56f15..3b11f4a 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -890,12 +890,12 @@ run_test 58 "Eviction in the middle of open RPC reply processing" test_59() { # bug 10589 zconf_mount `hostname` $MOUNT2 || error "Failed to mount $MOUNT2" sysctl -w lustre.fail_loc=0x311 - writes=`dd if=/dev/zero of=$DIR2/$tfile count=1 2>&1 | awk 'BEGIN { FS="+" } /out/ {print $1}'` + writes=$(LANG=C dd if=/dev/zero of=$DIR2/$tfile count=1 2>&1 | awk -F '+' '/out/ {print $1}') sysctl -w lustre.fail_loc=0 sync zconf_umount `hostname` $DIR2 -f - reads=`dd if=$DIR/$tfile of=/dev/null 2>&1 | awk 'BEGIN { FS="+" } /in/ {print $1}'` - [ $reads -eq $writes ] || error "read" $reads "blocks, must be" $writes + reads=$(LANG=C dd if=$DIR/$tfile of=/dev/null 2>&1 | awk -F '+' '/in/ {print $1}') + [ "$reads" -eq "$writes" ] || error "read" $reads "blocks, must be" $writes } run_test 59 "Read cancel race on client eviction" diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index a26a76e..712fca2 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4634,10 +4634,10 @@ test_120g() { run_test 120g "Early Lock Cancel: performance test =============" test_121() { #bug 10589 - writes=`dd if=/dev/zero of=$DIR/$tfile count=1 2>&1 | awk 'BEGIN { FS="+" } /out/ {print $1}'` + writes=$(LANG=C dd if=/dev/zero of=$DIR/$tfile count=1 2>&1 | awk -F '+' '/out/ {print $1}') sysctl -w lustre.fail_loc=0x310 cancel_lru_locks osc > /dev/null - reads=`dd if=$DIR/$tfile of=/dev/null 2>&1 | awk 'BEGIN { FS="+" } /in/ {print $1}'` + reads=$(LANG=C dd if=$DIR/$tfile of=/dev/null 2>&1 | awk -F '+' '/in/ {print $1}') sysctl -w lustre.fail_loc=0 [ "$reads" -eq "$writes" ] || error "read" $reads "blocks, must be" $writes } -- 1.8.3.1