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-1571 mdt: Do not update xid for open replay req
[fs/lustre-release.git]
/
lustre
/
tests
/
sanity-gss.sh
diff --git
a/lustre/tests/sanity-gss.sh
b/lustre/tests/sanity-gss.sh
index
cf5685a
..
701c0db
100644
(file)
--- a/
lustre/tests/sanity-gss.sh
+++ b/
lustre/tests/sanity-gss.sh
@@
-1,5
+1,5
@@
#!/bin/bash
#!/bin/bash
-# vim:
expandtab:
shiftwidth=4:softtabstop=4:tabstop=4:
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
#
# Run select tests by setting ONLY, or as arguments to the script.
# Skip specific tests by setting EXCEPT.
#
# Run select tests by setting ONLY, or as arguments to the script.
# Skip specific tests by setting EXCEPT.
@@
-26,6
+26,8
@@
export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$SRCDIR/../utils/gss:$PATH:/sb
export NAME=${NAME:-local}
SAVE_PWD=$PWD
export NAME=${NAME:-local}
SAVE_PWD=$PWD
+export MULTIOP=${MULTIOP:-multiop}
+
CLEANUP=${CLEANUP:-""}
SETUP=${SETUP:-""}
CLEANUP=${CLEANUP:-""}
SETUP=${SETUP:-""}
@@
-241,7
+243,7
@@
test_3() {
$RUNAS cat $file > /dev/null || error "$RUNAS_ID cat error"
# start multiop
$RUNAS cat $file > /dev/null || error "$RUNAS_ID cat error"
# start multiop
- $RUNAS
multiop
$file o_r &
+ $RUNAS
$MULTIOP
$file o_r &
OPPID=$!
# wait multiop finish its open()
sleep 1
OPPID=$!
# wait multiop finish its open()
sleep 1
@@
-421,7
+423,7
@@
test_8()
TOUCHPID=$!
echo "waiting for touch (pid $TOUCHPID) to finish..."
sleep 2 # give it a chance to really trigger context init rpc
TOUCHPID=$!
echo "waiting for touch (pid $TOUCHPID) to finish..."
sleep 2 # give it a chance to really trigger context init rpc
- do_facet $SINGLEMDS
sysctl -w lustre.
fail_loc=0
+ do_facet $SINGLEMDS
$LCTL set_param
fail_loc=0
wait $TOUCHPID || error "touch should have succeeded"
$LCTL dk | grep "Early reply #" || error "No early reply"
wait $TOUCHPID || error "touch should have succeeded"
$LCTL dk | grep "Early reply #" || error "No early reply"
@@
-638,7
+640,7
@@
switch_sec_test()
do_facet $SINGLEMDS lctl set_param fail_val=36
do_facet $SINGLEMDS lctl set_param fail_loc=0x513
log "starting multiop"
do_facet $SINGLEMDS lctl set_param fail_val=36
do_facet $SINGLEMDS lctl set_param fail_loc=0x513
log "starting multiop"
-
multiop
$filename m &
+
$MULTIOP
$filename m &
multiop_pid=$!
echo "multiop pid=$multiop_pid"
sleep 1
multiop_pid=$!
echo "multiop pid=$multiop_pid"
sleep 1
@@
-793,6
+795,6
@@
test_151() {
}
run_test 151 "secure mgs connection: server flavor control"
}
run_test 151 "secure mgs connection: server flavor control"
-equals_msg `basename $0`: test complete, cleaning up
+complete $SECONDS
check_and_cleanup_lustre
check_and_cleanup_lustre
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
+exit_status