From 4de440bb7a18f57b6869c83893f98fedf609856e Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Thu, 4 Dec 2008 17:48:11 +0000
Subject: [PATCH] b=17747 i=Nathan run_one: print PASS/FAIL depending on new
TEST_FAILED var
---
lustre/tests/test-framework.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 04eabd55f1..e479c5588a 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -79,6 +79,7 @@ print_summary () {
init_test_env() {
export LUSTRE=`absolute_path $LUSTRE`
export TESTSUITE=`basename $0 .sh`
+ export TEST_FAILED=false
[ -d /r ] && export ROOT=${ROOT:-/r}
export TMP=${TMP:-$ROOT/tmp}
@@ -1353,6 +1354,7 @@ error_noexit() {
done
debugrestore
[ "$TESTSUITELOG" ] && echo "$0: ${TYPE}: $TESTNAME $@" >> $TESTSUITELOG
+ TEST_FAILED=true
}
error() {
@@ -1500,7 +1502,8 @@ trace() {
}
pass() {
- echo PASS $@
+ $TEST_FAILED && echo -n "FAIL " || echo -n "PASS "
+ echo $@
}
check_mds() {
@@ -1523,6 +1526,7 @@ run_one() {
message=$2
tfile=f${testnum}
export tdir=d0.${TESTSUITE}/d${base}
+
local SAVE_UMASK=`umask`
umask 0022
@@ -1530,6 +1534,7 @@ run_one() {
log "== test $testnum: $message ============ `date +%H:%M:%S` ($BEFORE)"
#check_mds
export TESTNAME=test_$testnum
+ TEST_FAILED=false
test_${testnum} || error "test_$testnum failed with $?"
#check_mds
cd $SAVE_PWD
@@ -1538,6 +1543,7 @@ run_one() {
check_catastrophe || error "LBUG/LASSERT detected"
ps auxww | grep -v grep | grep -q multiop && error "multiop still running"
pass "($((`date +%s` - $BEFORE))s)"
+ TEST_FAILED=false
unset TESTNAME
unset tdir
umask $SAVE_UMASK
--
GitLab