X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frpc.sh;h=bbe9337414b35df8f48f690d3aae79365fd02815;hb=79020798bdcc09477b0b4d05b1d35e2432909aab;hp=e1127d20dabd38cee0a1d21b0dbed7431c5067f1;hpb=e4cf956f93a4384d19ea73e601a6651710703492;p=fs%2Flustre-release.git

diff --git a/lustre/tests/rpc.sh b/lustre/tests/rpc.sh
index e1127d2..bbe9337 100755
--- a/lustre/tests/rpc.sh
+++ b/lustre/tests/rpc.sh
@@ -9,11 +9,12 @@ if [ ! -f $LUSTRE/tests/rpc.sh ]; then
 fi
 
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
+RPC_MODE=true init_test_env
 . ${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 $?
+# Execute the command
+"$@"