b=17747

i=Tappro
FAIL_ON_ERROR=false fix: force suits exit 1 if some tests failed

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 1576482..865ead7 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1442,4 +1442,4 @@ run_test 45 "long unlink handling in ptlrpcd"
 
 
 equals_msg `basename $0`: test complete
 
 
 equals_msg `basename $0`: test complete

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 3c4bf29..ebf5cb8 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -578,4 +578,4 @@ run_test 10 "Running Availability for 6 hours..."
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 0139f0c..ce3d2f9 100644 (file)
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -79,3 +79,4 @@ run_test 8 "getattr large files ======"
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 [ -f "$LOG" ] && cat $LOG || true
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 [ -f "$LOG" ] && cat $LOG || true

+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 87b87af..b3902d8 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -962,4 +962,4 @@ run_test 59 "Read cancel race on client eviction"
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index d228500..3eaea5f 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -547,5 +547,4 @@ SLEEP=$((`date +%s` - $NOW))
 [ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP
 [ "$MOUNTED2" = yes ] && zconf_umount $HOSTNAME $MOUNT2 || true
 check_and_cleanup_lustre
 [ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP
 [ "$MOUNTED2" = yes ] && zconf_umount $HOSTNAME $MOUNT2 || true
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
-
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 1ae6256..5c8d9d3 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -188,4 +188,4 @@ run_test 7 "Fail OST before obd_destroy"
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index b72249f..2a2f26f 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1908,4 +1908,4 @@ run_test 82b "CMD: mkdir cross-node dir (fail mds with name)"
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index 62c7017..9024134 100644 (file)
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -1058,4 +1058,4 @@ run_test 102 "survive from insanely fast flavor switch"
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre
 
 equals_msg `basename $0`: test complete, cleaning up
 check_and_cleanup_lustre

-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true