/[MITgcm]/MITgcm/verification/testreport
ViewVC logotype

Diff of /MITgcm/verification/testreport

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.151 by jmc, Wed Dec 15 17:46:30 2010 UTC revision 1.153 by jmc, Wed Dec 29 22:35:50 2010 UTC
# Line 654  runmodel() Line 654  runmodel()
654                      echo " no previous $RUNLOG: assume NORMAL END" >> $RUNLOG 2>&1                      echo " no previous $RUNLOG: assume NORMAL END" >> $RUNLOG 2>&1
655                  fi                  fi
656              fi              fi
657              ENDVAL=`cat $RUNLOG | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`              #ENDVAL=`cat $RUNLOG | grep -v 'ABNORMAL END' | grep -c 'NORMAL END'`
658                ENDVAL=`tail $OUTPUTFILE | grep -c 'PROGRAM MAIN: Execution ended Normally'`
659          fi          fi
660          rm -f run.log_tmp          rm -f run.log_tmp
661          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then          if [ $RETVAL -eq 0 -a $ENDVAL -gt 0 ] ; then
# Line 1166  if test "x$OPTFILE" != xNONE ; then Line 1167  if test "x$OPTFILE" != xNONE ; then
1167      fi      fi
1168  else  else
1169      echo >> $SUMMARY      echo >> $SUMMARY
1170      echo "No \"OPTFILE\" was explicitly specified by testreport," >> $SUMMARY      echo "No \"OPTFILE\" was specified ; genmake2 found and uses:" >> $SUMMARY
1171      echo "   so the genmake default will be used." >> $SUMMARY      #-note: to be filled later after 1rst run
1172  fi  fi
1173  echo  echo
1174  echo >> $SUMMARY  echo >> $SUMMARY
# Line 1393  for dir in $TESTDIRS ; do Line 1394  for dir in $TESTDIRS ; do
1394              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state              echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
1395              sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state              sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
1396              echo " $mkOpt" >> $DRESULTS/genmake_state              echo " $mkOpt" >> $DRESULTS/genmake_state
1397                if test "x$OPTFILE" = xNONE ; then
1398                    eval $mkOpt
1399                    sed "/^No \"OPTFILE\" was specified ; genmake2/a\  OPTFILE=${OPTFILE}"\
1400                            $SUMMARY > tr_0.tmp_log
1401                    RETVAL=$?
1402                    if test "x$RETVAL" = x0 ; then rm -f $SUMMARY
1403                            cp tr_0.tmp_log $SUMMARY
1404                    else rm -f tr_0.tmp_log
1405                    fi
1406                fi
1407              gmkLog=$dir/$builddir/genmake.log              gmkLog=$dir/$builddir/genmake.log
1408              grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1              grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
1409              RETVAL=$?              RETVAL=$?
1410              if test "x$RETVAL" = x0 ; then              if test "x$RETVAL" = x0 ; then
1411                  echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state                  echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state
1412                  sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \                  sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \
1413                         | grep -v '^... compiler version ' > tr_vers.tmp_log                         | grep -v '^... compiler version ' > tr_1.tmp_log
1414                  sed -n '1,/^$/p' tr_vers.tmp_log | sed '/^$/d' | sed 's/^./ &/' \                  sed -n '1,/^$/p' tr_1.tmp_log | sed '/^$/d' | sed 's/^./ &/' \
1415                          >> $DRESULTS/genmake_state                          >> $DRESULTS/genmake_state
1416                  rm -f tr_vers.tmp_log                  rm -f tr_1.tmp_log
1417              fi              fi
1418          fi          fi
1419      fi      fi
Legend:
Removed from v.1.151  
changed lines
  Added in v.1.153
  ViewVC Help
Powered by ViewVC 1.1.22