diff options
| author | cvs2hg <devnull@localhost> | 2013-02-21 22:12:47 +0100 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2013-02-21 22:12:47 +0100 |
| commit | 8ee8a327c148bf97079fed578dab0995cbaa2219 (patch) | |
| tree | 0bf7f8e2bd360c94d835ca8226aea357927e9062 | |
| parent | b9b9ab98a6395b7c3f81b67c3b44afc304c83aa7 (diff) | |
| parent | 1a2baef5120a52411195a17d360a79e84a09797e (diff) | |
| download | nss-hg-8ee8a327c148bf97079fed578dab0995cbaa2219.tar.gz | |
artificial changeset: close fixup head b79e50420d90 for tag THUNDERBIRD_2_0b2_RELEASE
| -rw-r--r-- | security/nss/lib/nss/nss.h | 4 | ||||
| -rwxr-xr-x | security/nss/tests/all.sh | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 2ab7ddef4..07329658c 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -63,11 +63,11 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.11.5" _NSS_ECC_STRING " Beta 2" +#define NSS_VERSION "3.11.5" _NSS_ECC_STRING #define NSS_VMAJOR 3 #define NSS_VMINOR 11 #define NSS_VPATCH 5 -#define NSS_BETA PR_TRUE +#define NSS_BETA PR_FALSE /* * Return a boolean that indicates whether the underlying library diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh index b02dbbad0..67aa561bd 100755 --- a/security/nss/tests/all.sh +++ b/security/nss/tests/all.sh @@ -78,7 +78,8 @@ # ######################################################################## -TESTS="cipher perf cert dbtests tools fips sdr crmf smime ssl" +tests="cipher perf cert dbtests tools fips sdr crmf smime ssl" +TESTS=${TESTS:-$tests} SCRIPTNAME=all.sh CLEANUP="${SCRIPTNAME}" cd `dirname $0` # will cause problems if sourced @@ -92,12 +93,17 @@ fi for i in ${TESTS} do SCRIPTNAME=${i}.sh - echo "Running Tests for $i" if [ "$O_CRON" = "ON" ] then - (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file >> ${LOGFILE} 2>&1) + echo "Running tests for $i" >> ${LOGFILE} + echo "TIMESTAMP $i BEGIN: `date`" >> ${LOGFILE} + (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file) >> ${LOGFILE} 2>&1 + echo "TIMESTAMP $i END: `date`" >> ${LOGFILE} else - (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file 2>&1 | tee -a ${LOGFILE}) + echo "Running tests for $i" | tee -a ${LOGFILE} + echo "TIMESTAMP $i BEGIN: `date`" | tee -a ${LOGFILE} + (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file) 2>&1 | tee -a ${LOGFILE} + echo "TIMESTAMP $i END: `date`" | tee -a ${LOGFILE} fi done |