/[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.71 by jmc, Tue Aug 16 17:12:46 2005 UTC
# Line 27  usage() Line 27  usage()
27      echo "                             (DEF=\"make output.txt\")"      echo "                             (DEF=\"make output.txt\")"
28      echo "  (-m|-make) STRING        command to use for \"make\""      echo "  (-m|-make) STRING        command to use for \"make\""
29      echo "                             (DEF=\"make\")"      echo "                             (DEF=\"make\")"
30        echo "  (-odir) STRING           used to build output directory name"
31        echo "                             (DEF=\"hostname\")"
32      echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"      echo "  (-ptracers|-ptr) STRING  specify which ptracers to test"
33      echo "                             (DEF=\"1 2 3 4 5\")"      echo "                             (DEF=\"1 2 3 4 5\")"
34      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
# Line 95  testoutput_for_prop() Line 97  testoutput_for_prop()
97      fi      fi
98      if [ -r $1/$4/output.txt ]; then      if [ -r $1/$4/output.txt ]; then
99          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt          grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt
100          lncnt=`wc -l tmp1.txt | awk '{print $1}' `          lncntA=`wc -l tmp1.txt | awk '{print $1}' `
101          if [ $lncnt -lt 3 ]; then          if [ $lncntA -lt 3 ]; then
102              if [ $verbose -gt 0 ]; then              if [ $verbose -gt 0 ]; then
103                  echo Not enough lines of output when searching for "$2" 1>&2                  echo Not enough lines of output when searching for "$2" 1>&2
104              fi              fi
# Line 110  testoutput_for_prop() Line 112  testoutput_for_prop()
112          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
113      fi      fi
114      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
115      lncnt=`wc -l tmp2.txt | awk '{print $1}' `      lncntB=`wc -l tmp2.txt | awk '{print $1}' `
116      if [ $lncnt -lt 3 ]; then      if [ $lncntB -lt 3 ]; then
117          if [ $verbose -gt 0 ]; then          if [ $verbose -gt 0 ]; then
118              echo Not enough lines of output when searching for "$2" 1>&2              echo Not enough lines of output when searching for "$2" 1>&2
119          fi          fi
120          return 99          return 99
121      fi      fi
122        if [ $lncntA -ne $lncntB ]; then
123            if [ $verbose -gt 0 ]; then
124                echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2
125            fi
126            return 99
127        fi
128        non_real_numb=`egrep -c -i 'NAN|INF' tmp1.txt`
129        if [ $non_real_numb -gt 0 ]; then
130            echo testoutput_for_prop: output.txt has $non_real_numb not real numbers 1>&2
131            return 99
132        fi
133      if [ $debug -gt 0 ]; then      if [ $debug -gt 0 ]; then
134          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2          echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2
135      fi      fi
# Line 342  makeclean() Line 355  makeclean()
355      fi      fi
356  }  }
357    
358    postclean()
359    {
360        # postclean directory
361        if test "x$POSTCLEAN" = xt ; then
362            (
363                cd $1;
364                if test -r Makefile ; then
365                    $MAKE CLEAN >> /dev/null 2>&1
366                fi
367                exit 0
368            )
369        fi
370    }
371    
372  makedependmodel()  makedependmodel()
373  {  {
374      # makedependmodel directory      # makedependmodel directory
# Line 630  QUICK=f Line 657  QUICK=f
657  NOGENMAKE=f  NOGENMAKE=f
658  NOCLEAN=f  NOCLEAN=f
659  NODEPEND=f  NODEPEND=f
660    POSTCLEAN=f
661    
662  BASH=  BASH=
663  OPTFILE=NONE  OPTFILE=NONE
# Line 647  if test "x$CC" = x ; then Line 675  if test "x$CC" = x ; then
675  fi  fi
676  JOBS=  JOBS=
677  MPI=f  MPI=f
678    OUTDIR=
679  DELDIR=  DELDIR=
680    
681  ADM=  ADM=
# Line 703  for ac_option ; do Line 732  for ac_option ; do
732          -make=* | --make=*)          -make=* | --make=*)
733              MAKE=$ac_optarg ;;              MAKE=$ac_optarg ;;
734    
735            -odir | --odir)
736                ac_prev=OUTDIR ;;
737            -odir=* | --odir=*)
738                OUTDIR=$ac_optarg ;;
739    
740          -ptracers | --ptracers | -ptr | --ptr)          -ptracers | --ptracers | -ptr | --ptr)
741              ac_prev=PTRACERS_NUM ;;              ac_prev=PTRACERS_NUM ;;
742          -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)          -ptracers=* | --ptracers=* | -ptr=* | --ptr=*)
# Line 712  for ac_option ; do Line 746  for ac_option ; do
746          -j=*) JOBS=$ac_optarg ;;          -j=*) JOBS=$ac_optarg ;;
747    
748          -clean | --clean)          -clean | --clean)
749              CLEANUP=t ;;              CLEANUP=t ; DELDIR=t ;;
750    
751          -quick | --quick | -q | --q)          -quick | --quick | -q | --q)
752              QUICK=t ;;              QUICK=t ;;
# Line 723  for ac_option ; do Line 757  for ac_option ; do
757          -nodepend | --nodepend | -nd | --nd)          -nodepend | --nodepend | -nd | --nd)
758              NODEPEND=t ;;              NODEPEND=t ;;
759    
760            -postclean | --postclean | -pc | --pc)
761                POSTCLEAN=t ;;
762    
763          -mpi) MPI=t ;;          -mpi) MPI=t ;;
764    
765          -adm | -ad) ADM=t ;;          -adm | -ad) ADM=t ;;
# Line 789  MACH=`hostname` Line 826  MACH=`hostname`
826  UNAMEA=`uname -a`  UNAMEA=`uname -a`
827  DATE=`date +%Y%m%d`  DATE=`date +%Y%m%d`
828  BASE="tr_"$MACH"_"$DATE"_"  BASE="tr_"$MACH"_"$DATE"_"
829    if test "x$OUTDIR" != x ; then
830        BASE="tr_"$OUTDIR"_"$DATE"_"
831    fi
832  DNUM=0  DNUM=0
833  DRESULTS="$BASE$DNUM"  DRESULTS="$BASE$DNUM"
834  while test -e $DRESULTS ; do  while test -e $DRESULTS ; do
# Line 1034  for dir in $TESTDIRS ; do Line 1074  for dir in $TESTDIRS ; do
1074          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1075          echo "tdir='$dir'" >> $CDIR"/summary.txt"          echo "tdir='$dir'" >> $CDIR"/summary.txt"
1076      fi      fi
1077    
1078        postclean $dir/$builddir
1079            
1080      echo "-------------------------------------------------------------------------------"      echo "-------------------------------------------------------------------------------"
1081            
Legend:
Removed from v.1.66  
changed lines
  Added in v.1.71
  ViewVC Help
Powered by ViewVC 1.1.22