summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/runtest19
1 files changed, 10 insertions, 9 deletions
diff --git a/bin/runtest b/bin/runtest
index c8ade62..97dd51c 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -123,11 +123,12 @@ REPORT_ERR()
{
ERRMSG=$1
# print it with a banner shifted right a bit
- PRINT " *************************************"
- PRINT " $ERRMSG"
- PRINT " *************************************"
+ PRINT " *************************************"
+ PRINT " `date`"
+ PRINT " $ERRMSG"
+ PRINT " *************************************"
# report it in the FAILED-LOG file too
- (date; PRINT "$ERRMSG") >> $FAILEDLOG
+ PRINT "$ERRMSG" >> $FAILEDLOG
}
#
@@ -542,7 +543,7 @@ if [ -z "$NOCVS" -a ! -f $CVSLOG ]; then
rm -f $CVSLOG_LOCK
if [ $errcode -ne 0 ]; then
# test failed.
- REPORT_ERR "****CVS checkout FAILED in $HOSTNAME****"
+ REPORT_ERR "****FAILED ${HOSTNAME}: CVS checkout****"
exit $errcode
fi
PRINT Checking MAINFEST file ...
@@ -550,7 +551,7 @@ if [ -z "$NOCVS" -a ! -f $CVSLOG ]; then
errcode=$?
if [ $errcode -ne 0 ]; then
# test failed.
- REPORT_ERR "****MANIFEST check FAILED****"
+ REPORT_ERR "****FAILED ${HOSTNAME}: MANIFEST check****"
fi
PRINT_BLANK
else
@@ -561,13 +562,13 @@ else
WAITFOR $CVSLOG 90
if [ $WAIT_STATUS -ne 0 ]; then
errcode=$WAIT_STATUS
- REPORT_ERR "****Time expired waiting CVS update to start****"
+ REPORT_ERR "****FAILED ${HOSTNAME}: Time expired waiting CVS update to start****"
exit $errcode
fi
WAITTILL $CVSLOG_LOCK 10
if [ $WAIT_STATUS -ne 0 ]; then
errcode=$WAIT_STATUS
- REPORT_ERR "****Time expired waiting CVS update to finish****"
+ REPORT_ERR "****FAILED ${HOSTNAME}: Time expired waiting CVS update to finish****"
exit $errcode
fi
fi
@@ -617,7 +618,7 @@ if [ -n "$TESTHOST" -a $HOSTNAME != "$TESTHOST" ]; then
cat $TMP_OUTPUT
# Verify test script did complete by checking the last lines
(tail -2 $TMP_OUTPUT | grep -s '^Total time' > /dev/null 2>&1) ||
- (REPORT_ERR "****snaptest FAILED to complete in $h****" &&
+ (REPORT_ERR "****FAILED ${HOSTNAME}: snaptest did not complete****" &&
PRINT_BLANK)
rm $TMP_OUTPUT
done