X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-sec.sh;h=70e111498e5085534213276ed0b343d4bac8e782;hb=46021d556b67557d545e01522c41b9fad20120e1;hp=fe1db87cdc99600fa035c5d5d7ceaf3f4b82e181;hpb=dd6e6340c2a376fb2fb58569d940631a1d350e04;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index fe1db87..70e1114 100644
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -22,17 +22,18 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
+
+RUNAS="runas"
 
-RUNAS=${RUNAS:-"$LUSTRE/tests/runas"}
 WTL=${WTL:-"$LUSTRE/tests/write_time_limit"}
 
 CONFDIR=/etc/lustre
 PERM_CONF=$CONFDIR/perm.conf
-SANITYSECLOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 FAIL_ON_ERROR=false
 
-remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
-remote_ost_nodsh && skip "remote OST with nodsh" && exit 0
+require_dsh_mds || exit 0
+require_dsh_ost || exit 0
 
 ID0=${ID0:-500}
 ID1=${ID1:-501}
@@ -571,7 +572,5 @@ sec_unsetup
 
 sec_cleanup
 
-echo '=========================== finished ==============================='
-[ -f "$SANITYSECLOG" ] && \
-	cat $SANITYSECLOG && grep -q FAIL $SANITYSECLOG && exit 1 || true
-echo "$0 completed"
+complete $SECONDS
+exit_status