#!/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
-cmd=$1
-shift
-$cmd $@
+# Reset the trap on ERR set by the framework. Noticing this failure is the
+# framework's job.
+trap - ERR
-exit $?
+log "$HOSTNAME: executing $@"
+# Execute the command
+"$@"