--- MITgcm/verification/testreport 2012/08/16 18:44:48 1.176 +++ MITgcm/verification/testreport 2012/08/18 19:01:54 1.178 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.176 2012/08/16 18:44:48 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.178 2012/08/18 19:01:54 jmc Exp $ # $Name: $ # @@ -534,6 +534,9 @@ mk_fail=2 fi fi + if test $KIND = 1 -a -f taf_ftl.log ; then + head -1 taf_ftl.log >> $CDIR"/summary.txt" + fi if test $KIND = 2 -a -f taf_ad.log ; then head -1 taf_ad.log >> $CDIR"/summary.txt" nerr=`grep -c 'TAF *.* ERROR ' taf_ad.log` @@ -802,13 +805,12 @@ fi fi rm -f run.log_tmp - #- in all cases where OutputFile exists, report SIZE (and AD time) + #- in all cases where OutputFile exists, report SIZE and time if test -f $OUTPUTFILE ; then grep '(PID\.TID 0000\.0001) n.. =' $OUTPUTFILE \ - | sed 's/(PID.TID 0000.0001) //' >> $CDIR"/summary.txt" - if test $KIND = 2 ; then - grep -A3 'Seconds in section "ALL' $OUTPUTFILE >> $CDIR"/summary.txt" - fi + | sed 's/(PID.TID 0000.0001) //' >> $CDIR"/summary.txt" + grep -A3 'Seconds in section "ALL' $OUTPUTFILE \ + | sed 's/(PID.TID 0000.0001) //' >> $CDIR"/summary.txt" fi if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then @@ -1278,7 +1280,7 @@ fi # create the FORTRAN comparison code -if test -x tr_cmpnum ; then +if test "x$CLEANUP" = xt -o -x tr_cmpnum ; then echo "skipping comparison code build" else createcodelet @@ -1382,12 +1384,14 @@ line_4="2 d e n t r r" echo >> $SUMMARY fi +if test "x$CLEANUP" != xt ; then echo "$line_0" | tee -a $SUMMARY echo "$line_1" | tee -a $SUMMARY echo "$line_2" | tee -a $SUMMARY echo "$line_3" | tee -a $SUMMARY echo "$line_4" | tee -a $SUMMARY echo "" | tee -a $SUMMARY +fi echo "-------------------------------------------------------------------------------" # ...and each test directory... @@ -1692,3 +1696,4 @@ if test "x$DELDIR" = xt ; then rm -rf $DRESULTS fi +echo "======== End of testreport execution ========"