diff options
Diffstat (limited to 'nss/automation/buildbot-slave/build.sh')
| -rwxr-xr-x | nss/automation/buildbot-slave/build.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nss/automation/buildbot-slave/build.sh b/nss/automation/buildbot-slave/build.sh index 605293e..0917cec 100755 --- a/nss/automation/buildbot-slave/build.sh +++ b/nss/automation/buildbot-slave/build.sh @@ -199,7 +199,7 @@ test_nss() print_log "$ cd ${HGDIR}/nss/tests" cd ${HGDIR}/nss/tests print_log "$ ./all.sh" - ./all.sh 2>&1 | tee ${LOG_TMP} | grep ${GREP_BUFFER} ": #" + ./all.sh 2>&1 | tee ${LOG_TMP} | egrep ${GREP_BUFFER} ": #|^\[.{10}\] " OUTPUTFILE=${LOG_TMP} fi @@ -208,7 +208,7 @@ test_nss() RET=$? print_log "######## details of detected failures (if any) ########" - grep -B50 FAIL ${OUTPUTFILE} + grep -B50 FAILED ${OUTPUTFILE} [ $? -eq 1 ] || RET=1 print_result "NSS - tests - ${BITS} bits - ${OPT}" ${RET} 0 @@ -288,12 +288,14 @@ prepare() mv ${OUTPUTDIR} ${OUTPUTDIR}.last >/dev/null 2>&1 mkdir -p ${OUTPUTDIR} - if [ -z "${NSS_DISABLE_ECC}" -a -n "${NSS_ECC_MORE_THAN_SUITE_B}" ]; then - cd ${HGDIR}/nss - ECF="lib/freebl/ecl/ecl-curve.h" - print_log "hg revert -r NSS_3_11_1_RTM ${ECF}" - hg revert -r NSS_3_11_1_RTM security/nss/${ECF} - cp -f security/nss/${ECF} ${ECF} + # Remove temporary test files from previous jobs, that weren't cleaned up + # by move_results(), e.g. caused by unexpected interruptions. + rm -rf ${HGDIR}/tests_results/ + + cd ${HGDIR}/nss + + if [ -n "${FEWER_STRESS_ITERATIONS}" ]; then + sed -i 's/-c_1000_/-c_500_/g' tests/ssl/sslstress.txt fi return 0 |