/[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.105 by jmc, Fri Oct 12 21:39:37 2007 UTC revision 1.106 by jmc, Tue Oct 23 19:36:15 2007 UTC
# Line 575  runmodel() Line 575  runmodel()
575          printf 'runmodel in %s ...' $1 1>&2          printf 'runmodel in %s ...' $1 1>&2
576          # make output.txt          # make output.txt
577          echo          echo
578            if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
579                diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
580                outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
581            fi
582          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
583              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
584              ln -sf "../"$builddir"/"$EXECUTABLE .              ln -sf "../"$builddir"/"$EXECUTABLE .
# Line 1087  fi Line 1091  fi
1091  #  ...and each test directory...  #  ...and each test directory...
1092  for dir in $TESTDIRS ; do  for dir in $TESTDIRS ; do
1093            
1094        # set builddir & rundir:
1095        builddir="build"
1096        if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
1097        rundir="run"
1098        if test ! -d $dir/$rundir ; then
1099            rundir=$builddir
1100        fi
1101        CODE_DIR=$dir/$code_dir
1102        BUILD_DIR=$dir/$builddir
1103    
1104      #  Cleanup only!      #  Cleanup only!
1105      if test "x$CLEANUP" = xt ; then      if test "x$CLEANUP" = xt ; then
1106          if test -r $dir/build/Makefile ; then          if test -r $BUILD_DIR/Makefile ; then
1107              echo '  ------  clean dir:' $dir/build              echo '  ------  clean dir:' $dir/build
1108              ( cd $dir/build ; make CLEAN )              ( cd $BUILD_DIR ; make CLEAN )
1109          fi          fi
1110          if test -d $dir/run/CVS ; then          if test -d $dir/$rundir/CVS ; then
1111              echo '  ------  clean dir:' $dir/run              echo '  ------  clean dir:' $dir/$rundir
1112              run_clean $dir/run              run_clean $dir/$rundir
1113          fi          fi
1114          (          (
1115              cd $dir              cd $dir
# Line 1117  for dir in $TESTDIRS ; do Line 1131  for dir in $TESTDIRS ; do
1131    
1132      # Check for additional types of monitor output      # Check for additional types of monitor output
1133    
     builddir="build"  
     if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi  
     rundir="run"  
     if test ! -d $dir/$rundir ; then  
         rundir=$builddir  
     fi  
     CODE_DIR=$dir/$code_dir  
     BUILD_DIR=$dir/$builddir  
   
1134      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then      if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" = "xt" ; then
1135          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
1136          continue          continue
# Line 1203  for dir in $TESTDIRS ; do Line 1208  for dir in $TESTDIRS ; do
1208          for ex in $extra_runs ; do          for ex in $extra_runs ; do
1209              unset run              unset run
1210              results=$EMPTY_RESULTS              results=$EMPTY_RESULTS
1211                #  reference output file
1212                refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"`
1213              #  Create an output dir for each OPTFILE/tdir.ex combination              #  Create an output dir for each OPTFILE/tdir.ex combination
1214              rel_CDIR=$DRESULTS"/"$dir"."$ex              rel_CDIR=$DRESULTS"/"$dir"."$ex
1215              mkdir $rel_CDIR              mkdir $rel_CDIR
1216              CDIR=`pwd`"/$rel_CDIR"              CDIR=`pwd`"/$rel_CDIR"
1217              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
1218              run_clean $dir/tr_run.$ex              run_clean $dir/tr_run.$ex
1219              linkdata $dir/tr_run.$ex input.$ex input              linkdata $dir/tr_run.$ex input.$ex input
1220              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1221                  && results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`              && results=`testoutput_run $dir tr_run.$ex $refExOut`
1222              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1223              fres="$fres.$ex"              fres="$fres.$ex"
1224              echo              echo

Legend:
Removed from v.1.105  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.22