Skip to content
Snippets Groups Projects
Commit 4de440bb authored by Elena Gryaznova's avatar Elena Gryaznova
Browse files

b=17747

i=Nathan
run_one: print PASS/FAIL depending on new TEST_FAILED var
parent b1e7fe75
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,7 @@ print_summary () { ...@@ -79,6 +79,7 @@ print_summary () {
init_test_env() { init_test_env() {
export LUSTRE=`absolute_path $LUSTRE` export LUSTRE=`absolute_path $LUSTRE`
export TESTSUITE=`basename $0 .sh` export TESTSUITE=`basename $0 .sh`
export TEST_FAILED=false
[ -d /r ] && export ROOT=${ROOT:-/r} [ -d /r ] && export ROOT=${ROOT:-/r}
export TMP=${TMP:-$ROOT/tmp} export TMP=${TMP:-$ROOT/tmp}
...@@ -1353,6 +1354,7 @@ error_noexit() { ...@@ -1353,6 +1354,7 @@ error_noexit() {
done done
debugrestore debugrestore
[ "$TESTSUITELOG" ] && echo "$0: ${TYPE}: $TESTNAME $@" >> $TESTSUITELOG [ "$TESTSUITELOG" ] && echo "$0: ${TYPE}: $TESTNAME $@" >> $TESTSUITELOG
TEST_FAILED=true
} }
error() { error() {
...@@ -1500,7 +1502,8 @@ trace() { ...@@ -1500,7 +1502,8 @@ trace() {
} }
pass() { pass() {
echo PASS $@ $TEST_FAILED && echo -n "FAIL " || echo -n "PASS "
echo $@
} }
check_mds() { check_mds() {
...@@ -1523,6 +1526,7 @@ run_one() { ...@@ -1523,6 +1526,7 @@ run_one() {
message=$2 message=$2
tfile=f${testnum} tfile=f${testnum}
export tdir=d0.${TESTSUITE}/d${base} export tdir=d0.${TESTSUITE}/d${base}
local SAVE_UMASK=`umask` local SAVE_UMASK=`umask`
umask 0022 umask 0022
...@@ -1530,6 +1534,7 @@ run_one() { ...@@ -1530,6 +1534,7 @@ run_one() {
log "== test $testnum: $message ============ `date +%H:%M:%S` ($BEFORE)" log "== test $testnum: $message ============ `date +%H:%M:%S` ($BEFORE)"
#check_mds #check_mds
export TESTNAME=test_$testnum export TESTNAME=test_$testnum
TEST_FAILED=false
test_${testnum} || error "test_$testnum failed with $?" test_${testnum} || error "test_$testnum failed with $?"
#check_mds #check_mds
cd $SAVE_PWD cd $SAVE_PWD
...@@ -1538,6 +1543,7 @@ run_one() { ...@@ -1538,6 +1543,7 @@ run_one() {
check_catastrophe || error "LBUG/LASSERT detected" check_catastrophe || error "LBUG/LASSERT detected"
ps auxww | grep -v grep | grep -q multiop && error "multiop still running" ps auxww | grep -v grep | grep -q multiop && error "multiop still running"
pass "($((`date +%s` - $BEFORE))s)" pass "($((`date +%s` - $BEFORE))s)"
TEST_FAILED=false
unset TESTNAME unset TESTNAME
unset tdir unset tdir
umask $SAVE_UMASK umask $SAVE_UMASK
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment