Branch HEAD

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

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index beeeba3..8ad8174 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -4,7 +4,7 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 # bug number for skipped test:  3192 9977
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"14b  28"}
+ALWAYS_EXCEPT="14b 28 $SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$SLOW" = "no" ] && EXCEPT="$EXCEPT 16"
@@ -56,7 +56,7 @@ init_test_env $@
 SANITYLOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 FAIL_ON_ERROR=false
 
-if [ ! -z "$USING_KRB5" ]; then
+if $GSS_KRB5; then
     $RUNAS krb5_login.sh || exit 1
 fi