X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fdne_sanity.sh;h=7a18b9d85dcd534a0c5dc8305fa505ef737aa36f;hb=ec0b308614a2bad18a7a1fd805f36eb8ed6ea5eb;hp=0c1d64087ed646484ad727922a90b317a186f0eb;hpb=bf19f7a4fa6970f57bfe922461cfae7a3e80f89c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/dne_sanity.sh b/lustre/tests/dne_sanity.sh
index 0c1d640..7a18b9d 100644
--- a/lustre/tests/dne_sanity.sh
+++ b/lustre/tests/dne_sanity.sh
@@ -5,24 +5,21 @@
 
 set -e
 
-SRCDIR=$(cd $(dirname $0); echo $PWD)
-PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
+SRCDIR=$(dirname $0)
 
-SAVE_PWD=$PWD
-
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+ALWAYS_EXCEPT="$DNE_SANITY_EXCEPT "
+build_test_filter
+
 PARALLEL_RUNS=${PARALLEL_RUNS:-2}
 FAIL_ON_ERROR=false
 
 check_and_setup_lustre
 
-build_test_filter
-
 DIR=${DIR:-$MOUNT}
 
 ORIGIN_DIR=$DIR
@@ -78,7 +75,7 @@ test_sanity()
 	for index in $(seq $PARALLEL_RUNS); do
 		DIR=$ORIGIN_DIR/dir${index} PARALLEL=yes \
 		EXT2_DEV="$TMP/SANITY.LOOP_${index}" \
-		LOGDIR="${LOGDIR}_${index}" YAML_LOG="" sh sanity.sh &
+		LOGDIR="${LOGDIR}_${index}" YAML_LOG="" bash sanity.sh &
 		pid=$!
 		echo start sanity: $pid
 		rpids="$rpids $pid"