--- MITgcm/verification/testreport 2009/12/21 00:01:06 1.130 +++ MITgcm/verification/testreport 2010/01/14 23:17:42 1.132 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.130 2009/12/21 00:01:06 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.132 2010/01/14 23:17:42 jmc Exp $ # $Name: $ # @@ -463,6 +463,7 @@ tail make.log echo failed 1>&2 cp make.log $CDIR"/make.log" + rm -f $EXECUTABLE return 1 else echo successful 1>&2 @@ -630,7 +631,6 @@ ENDVAL=`cat $RUNLOG | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'` fi rm -f run.log_tmp - #if test "x$RETVAL" = x0 ; then if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then tail $RUNLOG echo successful 1>&2 @@ -638,6 +638,11 @@ #cp $OUTPUTFILE $CDIR"/"$OUTPUTFILE if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi return 0 + elif [ $RETVAL -ne 0 -a $ENDVAL -gt 0 ] ; then + #-- for some weird cases (run is finihed but with error code) + tail $RUNLOG + echo finished with error '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2 + return 0 else tail $RUNLOG echo failed '(run:' $RETVAL ' end:' $ENDVAL ')' 1>&2