X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale-nfs.sh;h=34ca53ecaa9ee6465c5b0e33cd3fe82d52879145;hb=8e563553c0a26f0d8e8caf2a44b44a7f552531e9;hp=1d27a08d4a1470d08699e5c92566478963550e45;hpb=e2226ae35978f223bf851dabf15eb6b606da8020;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale-nfs.sh b/lustre/tests/parallel-scale-nfs.sh
index 1d27a08..34ca53e 100755
--- a/lustre/tests/parallel-scale-nfs.sh
+++ b/lustre/tests/parallel-scale-nfs.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
-#
-#set -vx
 
 NFSVERSION=${1:-"3"}
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 # only call init_test_env if this script is called directly
 if [[ -z "$TESTSUITE" || "$TESTSUITE" = "$(basename $0 .sh)" ]]; then
-	init_test_env $@
+	init_test_env "$@"
+else
+	. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
 fi
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+
 init_logging
 
 racer=$LUSTRE/tests/racer/racer.sh
@@ -69,7 +71,6 @@ NFSCLIENT=true
 FAIL_ON_ERROR=false
 
 # common setup
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 clients=${NFS_CLIENTS:-$HOSTNAME}
 generate_machine_file $clients $MACHINEFILE ||
 	error "Failed to generate machine file"