LU-1538 tests: standardize test script init - dne-part-2

[fs/lustre-release.git] / lustre / tests / sanity-sec.sh

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 79901a5..949e146 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -7,21 +7,20 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
 set -e
 
 ONLY=${ONLY:-"$*"}

-# bug number for skipped test:
-ALWAYS_EXCEPT="              $SANITY_SEC_EXCEPT"
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-
-SRCDIR=$(dirname $0)
-export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
-export NAME=${NAME:-local}

 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@

-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-get_lustre_env
+

 init_logging
 
 init_logging
 

+ALWAYS_EXCEPT="$SANITY_SEC_EXCEPT "
+# bug number for skipped test:
+ALWAYS_EXCEPT+=" "
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"
+

 NODEMAP_TESTS=$(seq 7 26)
 
 if ! check_versions; then
 NODEMAP_TESTS=$(seq 7 26)
 
 if ! check_versions; then


@@ -29,10 +28,7 @@ if ! check_versions; then
        EXCEPT="$EXCEPT $NODEMAP_TESTS"
 fi
 
        EXCEPT="$EXCEPT $NODEMAP_TESTS"
 fi
 

-[ "$SLOW" = "no" ] && EXCEPT_SLOW="26"
-
-[ "$ALWAYS_EXCEPT$EXCEPT$EXCEPT_SLOW" ] &&
-       echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT $EXCEPT_SLOW"
+build_test_filter

 
 RUNAS_CMD=${RUNAS_CMD:-runas}
 
 
 RUNAS_CMD=${RUNAS_CMD:-runas}
 


@@ -99,8 +95,6 @@ IDENTITY_UPCALL=mdt.$MDT.identity_upcall
 
 SAVE_PWD=$PWD
 
 
 SAVE_PWD=$PWD
 

-build_test_filter
-

 sec_login() {
        local user=$1
        local group=$2
 sec_login() {
        local user=$1
        local group=$2