fixup commit for tag 'THUNDERBIRD_2_0b2_RELEASE' GECKO181_20070501_RELBRANCH THUNDERBIRD_2_0b2_RELEASE
authorcvs2hg
Wed, 17 Jan 2007 18:59:27 +0000
branchGECKO181_20070501_RELBRANCH
changeset 7645 b79e50420d90b7a3828331e6e02ff414f3984cca
parent 7641 35f4f16a363e1437e3da2cd4a034106db719891a (current diff)
parent 7644 081bf4d26b775342c97ad6cc13012306eb30e148 (diff)
child 10680 877f17933f86ebadac7caf0f952fff1a934ad4ff
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'THUNDERBIRD_2_0b2_RELEASE'
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -58,21 +58,21 @@ SEC_BEGIN_PROTOS
 
 /*
  * NSS's major version, minor version, patch level, and whether
  * this is a beta release.
  *
  * 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
+#define NSS_VERSION  "3.11.5" _NSS_ECC_STRING " Beta 2"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   11
 #define NSS_VPATCH   5
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 /*
  * Return a boolean that indicates whether the underlying library
  * will perform as the caller expects.
  *
  * The only argument is a string, which should be the verson
  * identifier of the NSS library. That string will be compared
  * against a string that represents the actual build version of
--- a/security/nss/tests/all.sh
+++ b/security/nss/tests/all.sh
@@ -73,40 +73,34 @@
 #    and a completely common environment
 #
 # file tells the test suite that the output is going to a log, so any
 #  forked() children need to redirect their output to prevent them from
 #  being over written.
 #
 ########################################################################
 
-tests="cipher perf cert dbtests tools fips sdr crmf smime ssl"
-TESTS=${TESTS:-$tests}
+TESTS="cipher perf cert dbtests tools fips sdr crmf smime ssl"
 SCRIPTNAME=all.sh
 CLEANUP="${SCRIPTNAME}"
 cd `dirname $0`	# will cause problems if sourced 
 
 #all.sh should be the first one to try to source the init 
 if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
     cd common
     . ./init.sh
 fi
 
 for i in ${TESTS}
 do
     SCRIPTNAME=${i}.sh
+    echo "Running Tests for $i"
     if [ "$O_CRON" = "ON" ]
     then
-        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}
+        (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file >> ${LOGFILE} 2>&1)
     else
-        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}
+        (cd ${QADIR}/$i ; . ./$SCRIPTNAME all file 2>&1 | tee -a ${LOGFILE})
     fi
 done
 
 SCRIPTNAME=all.sh
 
 . ${QADIR}/common/cleanup.sh