/[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.132 by jmc, Thu Jan 14 23:17:42 2010 UTC revision 1.133 by jmc, Sat Jan 16 22:08:27 2010 UTC
# Line 43  usage() Line 43  usage()
43      echo "                             (DEF=\"12\")"      echo "                             (DEF=\"12\")"
44      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"      echo "  (-j) JOBS                use \"make -j JOBS\" for parallel builds"
45      echo "  (-clean)                 *ONLY* run \"make CLEAN\""      echo "  (-clean)                 *ONLY* run \"make CLEAN\""
46        echo "  (-norun|-nr)             skip the \"runmodel\" stage (stop after make)"
47      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""      echo "  (-quick|-q)              same as \"-nogenmake -noclean -nodepend\""
48      echo "  (-nogenmake|-ng)         skip the genmake stage"      echo "  (-nogenmake|-ng)         skip the genmake stage"
49      echo "  (-noclean|-nc)           skip the \"make clean\" stage"      echo "  (-noclean|-nc)           skip the \"make clean\" stage"
# Line 791  fi Line 792  fi
792  GSL=f  GSL=f
793    
794  CLEANUP=f  CLEANUP=f
795    NORUN=f
796  QUICK=f  QUICK=f
797  NOGENMAKE=f  NOGENMAKE=f
798  NOCLEAN=f  NOCLEAN=f
# Line 903  for ac_option ; do Line 905  for ac_option ; do
905          -clean | --clean)          -clean | --clean)
906              CLEANUP=t ; DELDIR=t ;;              CLEANUP=t ; DELDIR=t ;;
907    
908            -norun | --norun | -nr | --nr)
909                NORUN=t ;;
910          -quick | --quick | -q | --q)          -quick | --quick | -q | --q)
911              QUICK=t ;;              QUICK=t ;;
912          -nogenmake | --nogenmake | -ng | --ng)          -nogenmake | --nogenmake | -ng | --ng)
# Line 1050  else Line 1054  else
1054  fi  fi
1055    
1056  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
1057  createcodelet  if test -x tr_cmpnum ; then
1058        echo "skipping comparison code build"
1059    else
1060        createcodelet
1061    fi
1062    
1063  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)
1064  if test "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = x ; then
# Line 1219  for dir in $TESTDIRS ; do Line 1227  for dir in $TESTDIRS ; do
1227    
1228      #  Check whether there are "extra runs" for this testdir      #  Check whether there are "extra runs" for this testdir
1229      extra_runs=      extra_runs=
1230      ex_run_dirs=`( cd $dir ; echo $inputdir.* )`      if test "x$NORUN" = xf ; then
1231            ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
1232        fi
1233      #echo "ex_run_dirs='$ex_run_dirs'"      #echo "ex_run_dirs='$ex_run_dirs'"
1234      for exd in $ex_run_dirs ; do      for exd in $ex_run_dirs ; do
1235          name=`echo $exd | sed -e "s/$inputdir\.//"`          name=`echo $exd | sed -e "s/$inputdir\.//"`
# Line 1262  for dir in $TESTDIRS ; do Line 1272  for dir in $TESTDIRS ; do
1272      mkdir $rel_CDIR      mkdir $rel_CDIR
1273      CDIR=`pwd`"/$rel_CDIR"      CDIR=`pwd`"/$rel_CDIR"
1274            
1275      if test "x$CLEANUP" = xt ; then      if test "x$NORUN" = xt ; then
1276          echo '====>>> this is to check that we never go through this part <<< ==='              run=N
1277          makeclean $dir/$builddir \          genmakemodel $dir/$builddir && genmake=Y \
1278              && run_clean $dir/$rundir              && makeclean $dir/$builddir \
1279                && run_clean $dir/$rundir \
1280                && symlink_mpifiles $dir $code_dir $builddir \
1281                && makedependmodel $dir/$builddir && makedepend=Y \
1282                && makemodel $dir/$builddir && make=Y
1283      else      else
1284          genmakemodel $dir/$builddir && genmake=Y \          genmakemodel $dir/$builddir && genmake=Y \
1285              && makeclean $dir/$builddir \              && makeclean $dir/$builddir \
# Line 1278  for dir in $TESTDIRS ; do Line 1292  for dir in $TESTDIRS ; do
1292              && results=`testoutput_run $dir $rundir $ref_outp`              && results=`testoutput_run $dir $rundir $ref_outp`
1293      fi      fi
1294            
1295        #echo "results='$results'"
1296      echo      echo
1297          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1298          echo          echo
# Line 1370  else Line 1385  else
1385      fi      fi
1386  fi  fi
1387    
1388  rm -f tr_cmpnum.c tr_cmpnum  if test "x$QUICK" = xf -a "x$NORUN" = xf ; then
1389        rm -f tr_cmpnum.c tr_cmpnum
1390    fi
1391    
1392  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1393      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'

Legend:
Removed from v.1.132  
changed lines
  Added in v.1.133

  ViewVC Help
Powered by ViewVC 1.1.22