Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-11171 tests: set parameters for racer_on_nfs
[fs/lustre-release.git]
/
lustre
/
tests
/
rpc.sh
diff --git
a/lustre/tests/rpc.sh
b/lustre/tests/rpc.sh
index
11c5181
..
a5831c8
100755
(executable)
--- a/
lustre/tests/rpc.sh
+++ b/
lustre/tests/rpc.sh
@@
-3,12
+3,19
@@
export PATH=`dirname $0`/../utils:$PATH
NAME=${NAME:-local}
LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
NAME=${NAME:-local}
LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+
+if [ ! -f $LUSTRE/tests/rpc.sh ]; then
+ LUSTRE=$(cd $(dirname $(which $0))/..; echo $PWD)
+fi
+
. $LUSTRE/tests/test-framework.sh
. $LUSTRE/tests/test-framework.sh
-init_test_env $@
+RPC_MODE=true init_test_env
. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-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
+"$@"