LU-1538 tests: standardize test script init – failover

[fs/lustre-release.git] / lustre / tests / rpc.sh

diff --git a/lustre/tests/rpc.sh b/lustre/tests/rpc.sh
index d2914b6..ec7533c 100755 (executable)
--- a/lustre/tests/rpc.sh
+++ b/lustre/tests/rpc.sh
@@ -1,20 +1,18 @@
 #!/bin/bash
-export PATH=`dirname $0`/../utils:$PATH
-NAME=${NAME:-local}
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 
 if [ ! -f $LUSTRE/tests/rpc.sh ]; then
-    LUSTRE=$(cd $(dirname $(which $0))/..; echo $PWD)
+       LUSTRE=$(cd $(dirname $(which $0))/..; echo $PWD)
 fi
 
 . $LUSTRE/tests/test-framework.sh
-init_test_env
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+RPC_MODE=true init_test_env
 
 # Reset the trap on ERR set by the framework.  Noticing this failure is the
 # framework's job.
-trap ERR
+trap - ERR
 
+log "$HOSTNAME: executing $@"
 # Execute the command
 "$@"