diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/tests/common/cleanup.sh | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/tests/common/cleanup.sh')
| -rwxr-xr-x | security/nss/tests/common/cleanup.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/security/nss/tests/common/cleanup.sh b/security/nss/tests/common/cleanup.sh index 97c139321..6316eecf8 100755 --- a/security/nss/tests/common/cleanup.sh +++ b/security/nss/tests/common/cleanup.sh @@ -6,6 +6,12 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then + if [ -z "${BUILD_OPT}" ] && [ "${OBJDIR}" == "Debug" ]; then + BUILD_OPT=0; + elif [ -z "${BUILD_OPT}" ] && [ "${OBJDIR}" == "Release" ]; then + BUILD_OPT=1; + fi + echo echo "SUMMARY:" echo "========" @@ -51,9 +57,10 @@ if [ -z "${CLEANUP}" -o "${CLEANUP}" = "${SCRIPTNAME}" ]; then echo html "END_OF_TEST<BR>" - html "</BODY></HTML>" + html "</BODY></HTML>" rm -f ${TEMPFILES} 2>/dev/null - if [ ${FAILED_CNT} -gt 0 ] || [ ${ASAN_CNT} -gt 0 ]; then + if [ ${FAILED_CNT} -gt 0 ] || [ ${ASAN_CNT} -gt 0 ] || + ([ ${CORE_CNT} -gt 0 ] && [ -n "${BUILD_OPT}" ] && [ ${BUILD_OPT} -eq 1 ]); then exit 1 fi |