diff options
| author | sonja.mirtitsch%sun.com <devnull@localhost> | 2002-01-28 19:35:53 +0000 |
|---|---|---|
| committer | sonja.mirtitsch%sun.com <devnull@localhost> | 2002-01-28 19:35:53 +0000 |
| commit | 4a89643576542cf02aba118ea40c3e37556e08db (patch) | |
| tree | 52daaee2d7edda9cb2b70c1ae483b154b9b1a5d7 | |
| parent | c75cb139f64e56f1cdd1e8e97a156c5cace5bc10 (diff) | |
| download | nss-hg-4a89643576542cf02aba118ea40c3e37556e08db.tar.gz | |
attempted fix for bug 115200, tinderbox reports false failures on machines
that run 32 and 63 bit tinderboxes
| -rw-r--r-- | security/nss/tests/header | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/security/nss/tests/header b/security/nss/tests/header index f094acdae..0e1b5868b 100644 --- a/security/nss/tests/header +++ b/security/nss/tests/header @@ -467,43 +467,21 @@ tbx_dirs() fi if [ -z "${RESULTDIR}" ] ; then # needs to be different for tinderbox Debug "Setting RESULTDIR for tinderbox" - RESULTDIR="${NSS_VER_DIR}/tinderbox/tests_results/security/${HOST}-`date +%Y%m%d-%H.%M`" - #RESULTDIR=${UX_MASTERDIR}/mozilla/tests_results/security + TXB_NOBITS="" + (echo $NSS_VER_DIR | grep 64 && TXB_NOBITS=64) >/dev/null + TRD="${HOST}{$TXB_NOBITS}-`date +%Y%m%d-%H.%M`" + RESULTDIR="${NSS_VER_DIR}/tinderbox/tests_results/security/${TRD}" fi TBX_DAILY_BUILD=`cd ../../../../..;pwd` NSS_VER_DIR="${TBX_DAILY_BUILD}/../.." - #if [ "$O_WIN" = "ON" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tbx/stalker_NT" - #else - #Debug "Testing for TBX_LOGDIR ${TBX_LOGDIR}" - #if [ -n "${TBX_LOGDIR}" ] ; then - #Debug "found TBX_LOGDIR ${TBX_LOGDIR}" - #TBX_LOGFILE_DIR="${TBX_LOGDIR}" - #elif [ -d "${NSS_VER_DIR}/logs/tinderbox/Solaris8" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/Solaris8" - #elif [ -d "${NSS_VER_DIR}/logs/tinderbox/Solaris8_64" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/Solaris8_64" - #elif [ -d "${NSS_VER_DIR}/logs/tinderbox/HP-UX-11.00" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/HP-UX-11.00" - #elif [ -d "${NSS_VER_DIR}/logs/tinderbox/HP-UX-11.00-64" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/HP-UX-11.00-64" - #elif [ -d "${NSS_VER_DIR}/logs/tinderbox/Solaris2.6" ] ; then - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/Solaris2.6" -#/export/nss_tbx_aix64/logs/tinderbox/AIX64 - #else - TBX_LOGFILE_DIR=`ls ${NSS_VER_DIR}/logs/tinderbox | - sed -e 's/ .*//g'` - if [ -z "$TBX_LOGFILE_DIR" ] ; then - TBX_LOGFILE_DIR=`ls ${NSS_VER_DIR}/logs/tbx | - sed -e 's/ .*//g'` - TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tbx/${TBX_LOGFILE_DIR}" - else - TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/${TBX_LOGFILE_DIR}" - fi - #TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs" - #fi - Debug "Set TBX_LOGFILE_DIR ${TBX_LOGFILE_DIR}" - #fi + TBX_LOGFILE_DIR=`ls ${NSS_VER_DIR}/logs/tinderbox | sed -e 's/ .*//g'` + if [ -z "$TBX_LOGFILE_DIR" ] ; then + TBX_LOGFILE_DIR=`ls ${NSS_VER_DIR}/logs/tbx | sed -e 's/ .*//g'` + TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tbx/${TBX_LOGFILE_DIR}" + else + TBX_LOGFILE_DIR="${NSS_VER_DIR}/logs/tinderbox/${TBX_LOGFILE_DIR}" + fi + Debug "Set TBX_LOGFILE_DIR ${TBX_LOGFILE_DIR}" set_daily_build_dirs UX_MASTERDIR=`cd ../../../..;pwd` |