/[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.66 by edhill, Fri Feb 4 16:41:42 2005 UTC revision 1.68 by edhill, Tue Jun 7 22:21:47 2005 UTC
# Line 95  testoutput_for_prop() Line 95  testoutput_for_prop()
95      fi      fi
96      if [ -r $1/$4/output.txt ]; then      if [ -r $1/$4/output.txt ]; then
97          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
98          lncnt=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l tmp1.txt | awk '{print $1}' `
99          if [ $lncnt -lt 3 ]; then          if [ $lncntA -lt 3 ]; then
100              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
101                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
102              fi              fi
# Line 110  testoutput_for_prop() Line 110  testoutput_for_prop()
110          echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2          echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2
111      fi      fi
112      grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt      grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt
113      lncnt=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l tmp2.txt | awk '{print $1}' `
114      if [ $lncnt -lt 3 ]; then      if [ $lncntB -lt 3 ]; then
115          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
116              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
117          fi          fi
118          return 99          return 99
119      fi      fi
120        if [ $lncntA -ne $lncntB ]; then
121            if [ $verbose -gt 0 ]; then
122                echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
123            fi
124            return 99
125        fi
126      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
127          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
128      fi      fi
# Line 342  makeclean() Line 348  makeclean()
348      fi      fi
349  }  }
350    
351    postclean()
352    {
353        # postclean directory
354        if test "x$POSTCLEAN" = xt ; then
355            (
356                cd $1;
357                if test -r Makefile ; then
358                    $MAKE CLEAN >> /dev/null 2>&1
359                fi
360                exit 0
361            )
362        fi
363    }
364    
365  makedependmodel()  makedependmodel()
366  {  {
367      # makedependmodel directory      # makedependmodel directory
# Line 630  QUICK=f Line 650  QUICK=f
650  NOGENMAKE=f  NOGENMAKE=f
651  NOCLEAN=f  NOCLEAN=f
652  NODEPEND=f  NODEPEND=f
653    POSTCLEAN=f
654    
655  BASH=  BASH=
656  OPTFILE=NONE  OPTFILE=NONE
# Line 723  for ac_option ; do Line 744  for ac_option ; do
744          -nodepend | --nodepend | -nd | --nd)          -nodepend | --nodepend | -nd | --nd)
745              NODEPEND=t ;;              NODEPEND=t ;;
746    
747            -postclean | --postclean | -pc | --pc)
748                POSTCLEAN=t ;;
749    
750          -mpi) MPI=t ;;          -mpi) MPI=t ;;
751    
752          -adm | -ad) ADM=t ;;          -adm | -ad) ADM=t ;;
# Line 1034  for dir in $TESTDIRS ; do Line 1058  for dir in $TESTDIRS ; do
1058          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1059          echo "tdir='$dir'" >> $CDIR"/summary.txt"          echo "tdir='$dir'" >> $CDIR"/summary.txt"
1060      fi      fi
1061    
1062        postclean $dir/$builddir
1063            
1064      echo "-------------------------------------------------------------------------------"      echo "-------------------------------------------------------------------------------"
1065            
Legend:
Removed from v.1.66  
changed lines
  Added in v.1.68
  ViewVC Help
Powered by ViewVC 1.1.22