diff options
| author | EKR <ekr@rtfm.com> | 2015-08-28 14:20:10 -0700 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2015-08-28 14:20:10 -0700 |
| commit | c55e67a3c3af276a6dbfa360a6ead5fe6e7ca7aa (patch) | |
| tree | f21ae4edfc339d6d024bcd1c0efddc5670079aac | |
| parent | 64ce927794c055d8d27b9c6a1a207058f2676ddc (diff) | |
| download | nss-hg-c55e67a3c3af276a6dbfa360a6ead5fe6e7ca7aa.tar.gz | |
Bug 1199494. Trap failures of subtests. r=mt
| -rwxr-xr-x | tests/common/cleanup.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/common/cleanup.sh b/tests/common/cleanup.sh index 17a62bbcb..8030045d4 100755 --- a/tests/common/cleanup.sh +++ b/tests/common/cleanup.sh @@ -32,10 +32,10 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then echo "--------------" LINES_CNT=$(cat ${RESULTS} | grep ">Passed<" | wc -l | sed s/\ *//) echo "Passed: ${LINES_CNT}" - LINES_CNT=$(cat ${RESULTS} | grep ">Failed<" | wc -l | sed s/\ *//) - echo "Failed: ${LINES_CNT}" - LINES_CNT=$(cat ${RESULTS} | grep ">Failed Core<" | wc -l | sed s/\ *//) - echo "Failed with core: ${LINES_CNT}" + FAILED_CNT=$(cat ${RESULTS} | grep ">Failed<" | wc -l | sed s/\ *//) + echo "Failed: ${FAILED_CNT}" + CORE_CNT=$(cat ${RESULTS} | grep ">Failed Core<" | wc -l | sed s/\ *//) + echo "Failed with core: ${CORE_CNT}" LINES_CNT=$(cat ${RESULTS} | grep ">Unknown<" | wc -l | sed s/\ *//) echo "Unknown status: ${LINES_CNT}" if [ ${LINES_CNT} -gt 0 ]; then @@ -46,4 +46,8 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then html "END_OF_TEST<BR>" html "</BODY></HTML>" rm -f ${TEMPFILES} 2>/dev/null + if [ ${FAILED_CNT} -gt 0 ]; then + exit 1 + fi + fi |