Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-694 ptlrpc: Job Stats
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-sec.sh
diff --git
a/lustre/tests/sanity-sec.sh
b/lustre/tests/sanity-sec.sh
index
fe1db87
..
f320e41
100644
(file)
--- 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}
. $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
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
FAIL_ON_ERROR=false
-re
mote_mds_nodsh && skip "remote MDS with nodsh" &&
exit 0
-re
mote_ost_nodsh && skip "remote OST with nodsh" &&
exit 0
+re
quire_dsh_mds ||
exit 0
+re
quire_dsh_ost ||
exit 0
ID0=${ID0:-500}
ID1=${ID1:-501}
ID0=${ID0:-500}
ID1=${ID1:-501}
@@
-571,7
+572,5
@@
sec_unsetup
sec_cleanup
sec_cleanup
-echo '=========================== finished ==============================='
-[ -f "$SANITYSECLOG" ] && \
- cat $SANITYSECLOG && grep -q FAIL $SANITYSECLOG && exit 1 || true
-echo "$0 completed"
+complete $(basename $0) $SECONDS
+exit_status