LU-15407 test: remove dummy enc key at cleanup

[fs/lustre-release.git] / lustre / tests / dne_sanity.sh

diff --git a/lustre/tests/dne_sanity.sh b/lustre/tests/dne_sanity.sh
index 0c1d640..7a18b9d 100644 (file)
--- 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"