From 4b7622f9883ebf7bd6ed38502ee33f9cb3869fe9 Mon Sep 17 00:00:00 2001 From: grev Date: Fri, 14 Nov 2008 18:13:22 +0000 Subject: [PATCH] b=16488 i=Oleg.Drokin RACER acc-sm test suit --- lustre/tests/test-framework.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index e9ddda7..f90002a 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -92,6 +92,9 @@ init_test_env() { fi export MDSRATE=${MDSRATE:-"$LUSTRE/tests/mdsrate"} [ ! -f "$MDSRATE" ] && export MDSRATE=$(which mdsrate 2> /dev/null) + if ! echo $PATH | grep -q $LUSTRE/test/racer; then + export PATH=$PATH:$LUSTRE/tests/racer + fi export LCTL=${LCTL:-"$LUSTRE/utils/lctl"} export LFS=${LFS:-"$LUSTRE/utils/lfs"} [ ! -f "$LCTL" ] && export LCTL=$(which lctl) @@ -549,8 +552,8 @@ wait_remote_prog () { [ "$PDSH" = "no_dsh" ] && return 0 while [ $WAIT -lt $2 ]; do - running=$(ps uax | grep "$PDSH.*$prog.*$MOUNT" | grep -v grep) - [ -z "${running}" ] && return 0 + running=$(ps uax | grep "$PDSH.*$prog.*$MOUNT" | grep -v grep) || true + [ -z "${running}" ] && return 0 || true echo "waited $WAIT for: " echo "$running" [ $INTERVAL -lt 60 ] && INTERVAL=$((INTERVAL + INTERVAL)) -- 1.8.3.1