From 2f2e652655b7aede457293947ec924c6a0c8b161 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 5 Apr 2005 11:55:27 -0500 Subject: [svn-r10539] Purpose: Bug fix Description: When chkmanifest failed, output is not dumped to failed detail section and people tend to ignore it. Solution: Buffer the output of chkmanifest in a file and dump it to failed detail section if it fails. Else, just output to standout. Platforms tested: Tested by hand in heping. --- bin/runtest | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bin/runtest b/bin/runtest index 2b8b107..7138197 100755 --- a/bin/runtest +++ b/bin/runtest @@ -647,6 +647,7 @@ DIFFLOG=${LOGDIR}/DIFF_LOG_${TODAY} # Snap Test hosts and Configuration files ALLHOSTSFILE=${SNAPYARD}/allhostfile SNAPTESTCFG=${SNAPYARD}/snaptest.cfg +TMPFILE="/tmp/#runtest.${TODAY}.$$" # more processing of setup option if requested if test x-$CMD = x-setup; then @@ -716,12 +717,25 @@ if [ -z "$NOCVS" ]; then exit $errcode fi PRINT Checking MAINFEST file ... - (cd $SNAPYARD/current; bin/chkmanifest) + (cd $SNAPYARD/current; bin/chkmanifest) > $TMPFILE 2>&1 errcode=$? - if [ $errcode -ne 0 ]; then + if [ $errcode -eq 0 ]; then + # test passed. + cat $TMPFILE + else # test failed. REPORT_ERR "****FAILED ${HOSTNAME}: MANIFEST check****" + ( echo ========================= + echo "MANIFEST checking failed output" + echo ========================= + cat $TMPFILE + echo ========================= + echo "MANIFEST checking failed output done" + echo ========================= + echo "" + ) >> $FAILEDDETAIL fi + rm $TMPFILE PRINT_BLANK else # make sure the cvs update, if done by another host, has completed. -- cgit v0.12