Bug 464000: Removed logging to temporary file. r=alexei

git-svn-id: svn://10.0.0.236/trunk@254985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slavomir.katuscak%sun.com
2008-11-11 09:06:52 +00:00
parent c5abf2d5b7
commit b5a81b9856

View File

@@ -65,23 +65,7 @@ libpkix_init()
fi
cd ${LIBPKIX_CURDIR}
# test at libpkix is written in ksh and hence cannot be sourced "."
# by this sh script. While we want to provide each libpkix test script the
# ability to be executed alone, we will need to use common/init.sh
# to set up bin etc. Since variable values can not be passed to sub-directory
# script for checking ($INIT_SOURCED), log is recreated and old data lost.
# The cludge way provided here is not ideal, but works (for now) :
# We save the log up to this point then concatenate it with libpkix log
# as the final one.
LOGFILE_ALL=${LOGFILE}
if [ ! -z ${LOGFILE_ALL} ] ; then
mv ${LOGFILE_ALL} ${LOGFILE_ALL}.tmp
touch ${LOGFILE_ALL}
fi
SCRIPTNAME="libpkix.sh"
LIBPKIX_LOG=${HOSTDIR}/libpkix.log #we don't want all the errormessages
# in the output.log, otherwise we can't tell what's a real error
}
############################## libpkix_cleanup ############################
@@ -90,12 +74,6 @@ libpkix_init()
########################################################################
libpkix_cleanup()
{
if [ ! -z ${LOGFILE_ALL} ] ; then
rm ${LOGFILE_ALL}
cat ${LOGFILE_ALL}.tmp ${LIBPKIX_LOG} > ${LOGFILE_ALL} 2> /dev/null
rm ${LOGFILE_ALL}.tmp
fi
html "</TABLE><BR>"
cd ${QADIR}
. common/cleanup.sh
@@ -183,7 +161,7 @@ fi
libpkix_run_tests()
{
if [ -n "${BUILD_LIBPKIX_TESTS}" ]; then
libpkix_UT_main | tee -a ${LIBPKIX_LOG}
libpkix_UT_main
fi
}