/[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.134 by jmc, Sun Jan 17 21:52:01 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 595  runmodel() Line 596  runmodel()
596          printf 'runmodel in %s ...' $1 1>&2          printf 'runmodel in %s ...' $1 1>&2
597          # make output.txt          # make output.txt
598          echo          echo
599          if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test -L $EXECUTABLE ; then
600              if test -x "../"$builddir"/"$EXECUTABLE ; then
601              diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1              diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
602              outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; fi              outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; fi
603              else rm -f $EXECUTABLE
604              fi
605          fi          fi
606          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
607              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_tmp              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_tmp
# Line 791  fi Line 795  fi
795  GSL=f  GSL=f
796    
797  CLEANUP=f  CLEANUP=f
798    NORUN=f
799  QUICK=f  QUICK=f
800  NOGENMAKE=f  NOGENMAKE=f
801  NOCLEAN=f  NOCLEAN=f
# Line 903  for ac_option ; do Line 908  for ac_option ; do
908          -clean | --clean)          -clean | --clean)
909              CLEANUP=t ; DELDIR=t ;;              CLEANUP=t ; DELDIR=t ;;
910    
911            -norun | --norun | -nr | --nr)
912                NORUN=t ;;
913          -quick | --quick | -q | --q)          -quick | --quick | -q | --q)
914              QUICK=t ;;              QUICK=t ;;
915          -nogenmake | --nogenmake | -ng | --ng)          -nogenmake | --nogenmake | -ng | --ng)
# Line 1050  else Line 1057  else
1057  fi  fi
1058    
1059  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
1060  createcodelet  if test -x tr_cmpnum ; then
1061        echo "skipping comparison code build"
1062    else
1063        createcodelet
1064    fi
1065    
1066  #  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)
1067  if test "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = x ; then
# Line 1219  for dir in $TESTDIRS ; do Line 1230  for dir in $TESTDIRS ; do
1230    
1231      #  Check whether there are "extra runs" for this testdir      #  Check whether there are "extra runs" for this testdir
1232      extra_runs=      extra_runs=
1233      ex_run_dirs=`( cd $dir ; echo $inputdir.* )`      if test "x$NORUN" = xf ; then
1234            ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
1235        fi
1236      #echo "ex_run_dirs='$ex_run_dirs'"      #echo "ex_run_dirs='$ex_run_dirs'"
1237      for exd in $ex_run_dirs ; do      for exd in $ex_run_dirs ; do
1238          name=`echo $exd | sed -e "s/$inputdir\.//"`          name=`echo $exd | sed -e "s/$inputdir\.//"`
# Line 1262  for dir in $TESTDIRS ; do Line 1275  for dir in $TESTDIRS ; do
1275      mkdir $rel_CDIR      mkdir $rel_CDIR
1276      CDIR=`pwd`"/$rel_CDIR"      CDIR=`pwd`"/$rel_CDIR"
1277            
1278      if test "x$CLEANUP" = xt ; then      if test "x$NORUN" = xt ; then
1279          echo '====>>> this is to check that we never go through this part <<< ==='              run=N
1280          makeclean $dir/$builddir \          genmakemodel $dir/$builddir && genmake=Y \
1281              && run_clean $dir/$rundir              && makeclean $dir/$builddir \
1282                && run_clean $dir/$rundir \
1283                && symlink_mpifiles $dir $code_dir $builddir \
1284                && makedependmodel $dir/$builddir && makedepend=Y \
1285                && makemodel $dir/$builddir && make=Y
1286      else      else
1287          genmakemodel $dir/$builddir && genmake=Y \          genmakemodel $dir/$builddir && genmake=Y \
1288              && makeclean $dir/$builddir \              && makeclean $dir/$builddir \
# Line 1278  for dir in $TESTDIRS ; do Line 1295  for dir in $TESTDIRS ; do
1295              && results=`testoutput_run $dir $rundir $ref_outp`              && results=`testoutput_run $dir $rundir $ref_outp`
1296      fi      fi
1297            
1298        #echo "results='$results'"
1299      echo      echo
1300          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1301          echo          echo
# Line 1370  else Line 1388  else
1388      fi      fi
1389  fi  fi
1390    
1391  rm -f tr_cmpnum.c tr_cmpnum  if test "x$QUICK" = xf -a "x$NORUN" = xf ; then
1392        rm -f tr_cmpnum.c tr_cmpnum
1393    fi
1394    
1395  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1396      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'
Legend:
Removed from v.1.132  
changed lines
  Added in v.1.134
  ViewVC Help
Powered by ViewVC 1.1.22