/[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.101 by jmc, Thu Sep 20 02:46:11 2007 UTC revision 1.112 by jmc, Sat Feb 9 18:30:25 2008 UTC
# Line 15  usage() Line 15  usage()
15      echo "  (-mpi)                   compile and run using MPI"      echo "  (-mpi)                   compile and run using MPI"
16      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"      echo "  (-ieee|-noieee)          if possible, use IEEE compiler flags"
17      echo "                             (DEF=\"-ieee\")"      echo "                             (DEF=\"-ieee\")"
18        echo "  (-gsl)                   compile with \"-gsl\" flag"
19      echo "  (-of=|-optfile=)STRING   list of optfiles to use"      echo "  (-of=|-optfile=)STRING   list of optfiles to use"
20      echo "  (-a|-addr) STRING        list of email recipients"      echo "  (-a|-addr) STRING        list of email recipients"
21      echo "                             (DEF=\"edhill@mitgcm.org\")"      echo "                             (DEF=\"\" no email is sent)"
22      echo "  (-t|-tdir) STRING        list of group and/or exp. dirs to test"      echo "  (-t|-tdir) STRING        list of group and/or exp. dirs to test"
23      echo "                             (recognized groups: basic, tutorials)"      echo "                             (recognized groups: basic, tutorials)"
24      echo "                             (DEF=\"\" which test all)"      echo "                             (DEF=\"\" which test all)"
# Line 73  build_mpack() Line 74  build_mpack()
74              echo              echo
75              HAVE_MPACK=f              HAVE_MPACK=f
76          fi          fi
         printf "building mpack...  "  
77          if test "x$CC" = x ; then          if test "x$CC" = x ; then
78              export CC=cc              export CC=cc
79          fi          fi
80            printf "building mpack (using CC=$CC)...  "
81          ( cd $MPACKDIR && ./configure && $MAKE ) > tr_build_mpack.out 2>&1          ( cd $MPACKDIR && ./configure && $MAKE ) > tr_build_mpack.out 2>&1
82          RETVAL=$?          RETVAL=$?
83          if test "x$RETVAL" != x0 ; then          if test "x$RETVAL" != x0 ; then
# Line 87  build_mpack() Line 88  build_mpack()
88          else          else
89              rm -f tr_build_mpack.out              rm -f tr_build_mpack.out
90              HAVE_MPACK=t              HAVE_MPACK=t
91                echo "OK"
92          fi          fi
93      else      else
94          HAVE_MPACK=t          HAVE_MPACK=t
95            echo "done"
96      fi      fi
     echo "OK"  
97  }  }
98    
99  testoutput_var()  testoutput_var()
# Line 174  testoutput_var() Line 176  testoutput_var()
176      return $digits_of_similarity      return $digits_of_similarity
177  }  }
178    
 dashnum()  
 {  
     # dashnum n1 n2 n3 ...  
     #  
     #  print numbers using %3i format or "--" if number = 99  
   
     for num in $@ ; do  
         if [ $num = 99 ]; then  
             printf ' --'  
         else  
             printf '%3i' $num  
         fi  
     done  
 }  
   
 testoutput_ad()  
 {  
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt  
     grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $5}' > t15.txt  
     grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt  
     grep $3 $1/$2/$OUTPUTFILE | awk '{print NR " " $6}' > t16.txt  
     join t05.txt t15.txt > t5.txt  
     join t06.txt t16.txt > t6.txt  
     echo "-1" >> t5.txt  
     echo "-1" >> t6.txt  
     digits_5=`./tr_cmpnum < t5.txt`  
     digits_6=`./tr_cmpnum < t6.txt`  
     dashnum $digits_5 $digits_6  
     rm -f t[01][56].txt t[56].txt  
 }  
   
179  check_for_add_mon_output()  check_for_add_mon_output()
180  {  {
181      # Check for additional types of monitor output      # Check for additional types of monitor output
# Line 235  testoutput_run() Line 206  testoutput_run()
206      # testoutput_run directory subdir reference_output      # testoutput_run directory subdir reference_output
207      #      #
208      #  test output from 1 run in "directory"      #  test output from 1 run in "directory"
209  #   if test "x$ADM" = x ; then  # --> same processing for adjoint & forward test
210          # default list of output variables to be checked:          # default list of output variables to be checked:
211          #  1rst : main variable used to decide if it pass or FAIL          #  1rst : main variable used to decide if it pass or FAIL
212          #  others : number of matching digits to be printed in summary.txt          #  others : number of matching digits to be printed in summary.txt
# Line 330  testoutput_run() Line 301  testoutput_run()
301          else          else
302            echo $allargs            echo $allargs
303          fi          fi
304    # <-- same processing for adjoint & forward test
 #   else  
 #       testoutput_ad $1 $2 "precision_grdchk_result"  
 #   fi  
305  }  }
306    
307  genmakemodel()  genmakemodel()
# Line 361  genmakemodel() Line 329  genmakemodel()
329              if test "x$IEEE" != x ; then              if test "x$IEEE" != x ; then
330                  command="$command -ieee"                  command="$command -ieee"
331              fi              fi
332                if test "x$GSL" = xt ; then
333                    command="$command -gsl"
334                fi
335              if test "x$MPI" = xt ; then              if test "x$MPI" = xt ; then
336                  command="$command -mpi"                  command="$command -mpi"
337              fi              fi
# Line 433  run_clean() Line 404  run_clean()
404              find . -type l -exec rm {} \;              find . -type l -exec rm {} \;
405              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime              rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
406              rm -rf mnc_test_*              rm -rf mnc_test_*
407                rm -f *_MIT_CE_000.opt0000 costfunction*0000
408              echo successful 1>&2              echo successful 1>&2
409              exit 0              exit 0
410          )          )
# Line 503  symlink_mpifiles() Line 475  symlink_mpifiles()
475      CODE_DIR=$dir/$code_dir      CODE_DIR=$dir/$code_dir
476            
477      # These are files that should replace their counter-part when using -mpi      # These are files that should replace their counter-part when using -mpi
478      MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")`      MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi" -print)`
479    
480      #  Is this an MPI run?      #  Is this an MPI run?
481      if test "x$MPI" = xt ; then      if test "x$MPI" = xt ; then
# Line 561  linkdata() Line 533  linkdata()
533                      if test -h eedata ; then rm -f eedata ; fi                      if test -h eedata ; then rm -f eedata ; fi
534                  fi                  fi
535              fi              fi
536                prevDir='NONE'
537              for ldir in $* ; do              for ldir in $* ; do
538                  if test -d "../"$ldir ; then                  if test -d "../"$ldir -a $ldir != $prevDir ; then
539                      printf 'ldir='${ldir} 1>&2                      printf 'ldir='${ldir} 1>&2
540                      files=`( cd "../"$ldir ; ls -1 | grep -v CVS )`                      files=`( cd "../"$ldir ; ls -1 | grep -v CVS )`
541                      for i in $files ; do                      for i in $files ; do
# Line 578  linkdata() Line 551  linkdata()
551                      fi                      fi
552                      printf ' ; ' 1>&2                      printf ' ; ' 1>&2
553                  fi                  fi
554                    prevDir=$ldir
555              done              done
556          )          )
557      fi      fi
# Line 594  runmodel() Line 568  runmodel()
568          printf 'runmodel in %s ...' $1 1>&2          printf 'runmodel in %s ...' $1 1>&2
569          # make output.txt          # make output.txt
570          echo          echo
571            if test -L $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
572                diff -q $EXECUTABLE "../"$builddir"/"$EXECUTABLE > /dev/null 2>&1
573                outD=$? ; if test $outD != 0 ; then rm -f $EXECUTABLE ; rm -f run.log ; fi
574            fi
575          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then          if test ! -x $EXECUTABLE -a -x "../"$builddir"/"$EXECUTABLE ; then
576              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00              echo " link" $EXECUTABLE "from dir ../"$builddir > run.log_00
577              ln -sf "../"$builddir"/"$EXECUTABLE .              ln -sf "../"$builddir"/"$EXECUTABLE .
# Line 648  createcodelet() Line 626  createcodelet()
626  {  {
627      # create codelet for comparing model output      # create codelet for comparing model output
628    
629      printf "creating the comparison code...  "      printf "creating the comparison code (using CC=$CC)...  "
630      cat > tr_cmpnum.c <<EOF      cat > tr_cmpnum.c <<EOF
631  #include <stdio.h>  #include <stdio.h>
632  #include <math.h>  #include <math.h>
# Line 745  scandirs() Line 723  scandirs()
723  debug=0  debug=0
724  verbose=1  verbose=1
725  clean=0  clean=0
 expts=''  
 # ieee=1  
726    
727  IEEE=true  IEEE=true
728  if test "x$MITGCM_IEEE" != x ; then  if test "x$MITGCM_IEEE" != x ; then
729      IEEE=$MITGCM_IEEE      IEEE=$MITGCM_IEEE
730  fi  fi
731    GSL=f
732    
733  CLEANUP=f  CLEANUP=f
734  QUICK=f  QUICK=f
# Line 882  for ac_option ; do Line 858  for ac_option ; do
858    
859          -ieee) IEEE=true ;;          -ieee) IEEE=true ;;
860          -noieee) IEEE= ;;          -noieee) IEEE= ;;
861            -gsl) GSL=t ;;
862    
863          -verbose) verbose=2 ;;          -verbose) verbose=2 ;;
864          -debug) debug=1 ;;          -debug) debug=1 ;;
# Line 918  fi Line 895  fi
895  #- setting for forward or ADM testing  #- setting for forward or ADM testing
896  if test "x$ADM" = xt ; then  if test "x$ADM" = xt ; then
897      code_dir=code_ad      code_dir=code_ad
898      input_dirs='input_ad input'      inputdir=input_ad
899      ref_outp="output_adm.txt"      ref_outp="output_adm.txt"
900      EXECUTABLE="mitgcmuv_ad"      EXECUTABLE="mitgcmuv_ad"
901  else  else
902      code_dir=code      code_dir=code
903      input_dirs='input'      inputdir=input
904      ref_outp="output.txt"      ref_outp="output.txt"
905      EXECUTABLE="mitgcmuv"      EXECUTABLE="mitgcmuv"
906  fi  fi
907    
908  if test "x$TESTDIRS" = x ; then  if test "x$TESTDIRS" = x ; then
909  #   if test "x$ADM" = xt ; then      LIST=`scandirs results/$ref_outp`
 #       LIST=`scandirs results_ad/$ref_outp`  
 #   else  
         LIST=`scandirs results/$ref_outp`  
 #   fi  
910  else  else
911      #- expand group of experiments:      #- expand group of experiments:
912      LIST=" "      LIST=" "
# Line 985  if test "x$MPI" = xt ; then Line 958  if test "x$MPI" = xt ; then
958      OUTPUTFILE="STDOUT.0000"      OUTPUTFILE="STDOUT.0000"
959  fi  fi
960    
 #echo "OK"  
961  echo "OK (COMMAND= $COMMAND )"  echo "OK (COMMAND= $COMMAND )"
962    
963  # set the Default List of output variables to be checked:  # set the Default List of output variables to be checked:
# Line 999  if test "x$ADM" = x ; then Line 971  if test "x$ADM" = x ; then
971      ii=`echo $EMPTY_RESULTS | awk '{print NF}'`      ii=`echo $EMPTY_RESULTS | awk '{print NF}'`
972      EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`      EMPTY_RESULTS=$EMPTY_RESULTS`expr $LEN_CHECK_LIST - $ii | awk 'BEGIN{FS=":"}{for(i=1;i<=$1;i++){printf "  ."}}'`
973  else  else
974      DEF_CHECK_LIST='Cost Cost Grad'      DEF_CHECK_LIST='Grad Cost Grad'
975      EMPTY_RESULTS='.. ..'      EMPTY_RESULTS='.. ..'
976      LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`      LEN_CHECK_LIST=`echo $DEF_CHECK_LIST | sed 's/ [a-zA-Z0-9]*+/&mn &mx &av &sd/g' | awk '{print NF-1}'`
977  fi  fi
# Line 1007  fi Line 979  fi
979  #  create the FORTRAN comparison code  #  create the FORTRAN comparison code
980  createcodelet  createcodelet
981    
982  #  build the mpack utility  #  build the mpack utility (if ADDRESSES = NONE, do it to test the build)
983  if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then  if test "x$ADDRESSES" = x ; then
984      echo "skipping mpack build"      echo "skipping mpack build"
985  else  else
986      build_mpack      build_mpack
987  fi  fi
988    
989  #  Create a uniquely named directory to store results  #  Create a uniquely named directory to store results
990    CMDLINE=$0
991    for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
992  MACH=`hostname`  MACH=`hostname`
993  UNAMEA=`uname -a`  UNAMEA=`uname -a`
994  DATE=`date +%Y%m%d`  DATE=`date +%Y%m%d`
# Line 1035  if test "x$RETVAL" != x0 ; then Line 1009  if test "x$RETVAL" != x0 ; then
1009      exit 1      exit 1
1010  fi  fi
1011  SUMMARY="$DRESULTS/summary.txt"  SUMMARY="$DRESULTS/summary.txt"
 printf "Start time:  " >> $SUMMARY  
1012  start_date=`date`  start_date=`date`
1013  echo $start_date > $SUMMARY  echo $start_date > $SUMMARY
1014    echo 'run:' $CMDLINE >> $SUMMARY
1015    echo 'on :' $UNAMEA  >> $SUMMARY
1016    
1017  of_path=  of_path=
1018  if test "x$OPTFILE" != xNONE ; then  if test "x$OPTFILE" != xNONE ; then
# Line 1096  else Line 1071  else
1071      echo "ADJOINT=true" >> $SUMMARY      echo "ADJOINT=true" >> $SUMMARY
1072      echo >> $SUMMARY      echo >> $SUMMARY
1073      if [ $MATCH_CRIT -lt 10 ] ;      if [ $MATCH_CRIT -lt 10 ] ;
1074      then line_0="default  "$MATCH_CRIT ;      then line_0="default     "$MATCH_CRIT ;
1075      else line_0="default "$MATCH_CRIT ; fi      else line_0="default    "$MATCH_CRIT ; fi
1076      echo "$line_0" | tee -a $SUMMARY      echo "$line_0" | tee -a $SUMMARY
1077      cat << EOF | tee -a $SUMMARY      cat << EOF | tee -a $SUMMARY
1078  G D M    C  G  G D M    C  G
# Line 1111  fi Line 1086  fi
1086  #  ...and each test directory...  #  ...and each test directory...
1087  for dir in $TESTDIRS ; do  for dir in $TESTDIRS ; do
1088            
1089        # set builddir & rundir:
1090        builddir="build"
1091        if test ! -d $dir/$builddir ; then mkdir $dir/$builddir ; fi
1092        rundir="run"
1093        if test ! -d $dir/$rundir ; then
1094            rundir=$builddir
1095        fi
1096        CODE_DIR=$dir/$code_dir
1097        BUILD_DIR=$dir/$builddir
1098    
1099      #  Cleanup only!      #  Cleanup only!
1100      if test "x$CLEANUP" = xt ; then      if test "x$CLEANUP" = xt ; then
1101          if test -r $dir/build/Makefile ; then          if test -r $BUILD_DIR/Makefile ; then
1102              echo '  ------  clean dir:' $dir/build              echo '  ------  clean dir:' $dir/build
1103              ( cd $dir/build ; make CLEAN )              ( cd $BUILD_DIR ; make CLEAN )
1104          fi          fi
1105          if test -d $dir/run/CVS ; then          if test -d $dir/$rundir/CVS ; then
1106              echo '  ------  clean dir:' $dir/run              echo '  ------  clean dir:' $dir/$rundir
1107              run_clean $dir/run              run_clean $dir/$rundir
1108          fi          fi
1109          (          (
1110              cd $dir              cd $dir
# Line 1130  for dir in $TESTDIRS ; do Line 1115  for dir in $TESTDIRS ; do
1115    
1116      #  Verify that the testdir exists and contains previous      #  Verify that the testdir exists and contains previous
1117      #  results in the correct location--or skip this directory!      #  results in the correct location--or skip this directory!
1118      fout=      fout=$dir"/results/"$ref_outp
     if test "x$ADM" = x ; then  
         fout=$dir"/results/"$ref_outp  
     else  
         fout=$dir"/results_ad/"$ref_outp  
     fi  
1119      if test ! -r $fout ; then      if test ! -r $fout ; then
1120          echo "can't read \"$fout\" -- skipping $dir"          echo "can't read \"$fout\" -- skipping $dir"
1121          continue          continue
# Line 1146  for dir in $TESTDIRS ; do Line 1126  for dir in $TESTDIRS ; do
1126    
1127      # Check for additional types of monitor output      # Check for additional types of monitor output
1128    
     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  
   
1129      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
1130          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"          echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir"
1131          continue          continue
# Line 1166  for dir in $TESTDIRS ; do Line 1137  for dir in $TESTDIRS ; do
1137    
1138      #  Check whether there are "extra runs" for this testdir      #  Check whether there are "extra runs" for this testdir
1139      extra_runs=      extra_runs=
1140      if test "x$ADM" = x ; then      ex_run_dirs=`( cd $dir ; echo $inputdir.* )`
1141          ex_run_dirs=`( cd $dir ; echo input.* )`      #echo "ex_run_dirs='$ex_run_dirs'"
1142          #echo "ex_run_dirs='$ex_run_dirs'"      for exd in $ex_run_dirs ; do
1143          for exd in $ex_run_dirs ; do          name=`echo $exd | sed -e "s/$inputdir\.//"`
1144              name=`echo $exd | sed -e 's/input.//g'`          refExOut=`echo $ref_outp | sed "s/\./.${name}./"`
1145              outf="$dir/results/output.$name.txt"          outf="$dir/results/$refExOut"
1146              if test -f $outf -a -r $outf ; then          if test -f $outf -a -r $outf ; then
1147                  if test "x$MULTI_THREAD" = "xt" ; then              if test "x$MULTI_THREAD" = "xt" ; then
1148                      if test -r $dir"/"$exd"/eedata.mth" ; then                  if test -r $dir"/"$exd"/eedata.mth" ; then
                         extra_runs="$extra_runs $name"  
                     #else echo $dir"/"$exd"/eedata.mth: not found"  
                     fi  
                 else  
1149                      extra_runs="$extra_runs $name"                      extra_runs="$extra_runs $name"
1150                    #else echo $dir"/"$exd"/eedata.mth: not found"
1151                  fi                  fi
1152                else
1153                    extra_runs="$extra_runs $name"
1154              fi              fi
1155          done          fi
1156      fi      done
1157    
1158      echo "-------------------------------------------------------------------------------"      echo "-------------------------------------------------------------------------------"
1159      echo      echo
# Line 1212  for dir in $TESTDIRS ; do Line 1182  for dir in $TESTDIRS ; do
1182              && symlink_mpifiles $dir $code_dir $builddir \              && symlink_mpifiles $dir $code_dir $builddir \
1183              && makedependmodel $dir/$builddir && makedepend=Y \              && makedependmodel $dir/$builddir && makedepend=Y \
1184              && makemodel $dir/$builddir && make=Y \              && makemodel $dir/$builddir && make=Y \
1185              && linkdata $dir/$rundir $input_dirs \              && linkdata $dir/$rundir $inputdir input \
1186              && runmodel $dir/$rundir && run=Y \              && runmodel $dir/$rundir && run=Y \
1187              && results=`testoutput_run $dir $rundir $ref_outp`              && results=`testoutput_run $dir $rundir $ref_outp`
1188      fi      fi
1189            
1190      echo      echo
 #   if test "x$ADM" = x ; then  
1191          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`          fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1192          echo          echo
1193          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY          echo "$fres" | sed 's/ 99/ --/g' | sed 's/  > />/' | sed 's/  < /</' >> $SUMMARY
# Line 1228  for dir in $TESTDIRS ; do Line 1197  for dir in $TESTDIRS ; do
1197          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"          echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1198          echo "DATE='$DATE'" >> $CDIR"/summary.txt"          echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1199          echo "tdir='$dir'" >> $CDIR"/summary.txt"          echo "tdir='$dir'" >> $CDIR"/summary.txt"
1200            if test "x$ADM" = xt ; then
1201                head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt"
1202                grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \
1203                                    >> $CDIR"/summary.txt"
1204            fi
1205    
1206          for ex in $extra_runs ; do          for ex in $extra_runs ; do
1207              unset run              unset run
1208              results=$EMPTY_RESULTS              results=$EMPTY_RESULTS
1209                #  reference output file
1210                refExOut=`echo $ref_outp | sed "s/\./.${ex}./g"`
1211              #  Create an output dir for each OPTFILE/tdir.ex combination              #  Create an output dir for each OPTFILE/tdir.ex combination
1212              rel_CDIR=$DRESULTS"/"$dir"."$ex              rel_CDIR=$DRESULTS"/"$dir"."$ex
1213              mkdir $rel_CDIR              mkdir $rel_CDIR
1214              CDIR=`pwd`"/$rel_CDIR"              CDIR=`pwd`"/$rel_CDIR"
1215              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"              test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex"
1216              run_clean $dir/tr_run.$ex              run_clean $dir/tr_run.$ex
1217              linkdata $dir/tr_run.$ex input.$ex input              linkdata $dir/tr_run.$ex $inputdir.$ex $inputdir input
1218              runmodel $dir/tr_run.$ex && run=Y \              runmodel $dir/tr_run.$ex && run=Y \
1219                  && results=`testoutput_run $dir tr_run.$ex "output.${ex}.txt"`              && results=`testoutput_run $dir tr_run.$ex $refExOut`
1220              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`              fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
1221              fres="$fres.$ex"              fres="$fres.$ex"
1222              echo              echo
# Line 1251  for dir in $TESTDIRS ; do Line 1227  for dir in $TESTDIRS ; do
1227              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"              echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"
1228              echo "DATE='$DATE'" >> $CDIR"/summary.txt"              echo "DATE='$DATE'" >> $CDIR"/summary.txt"
1229              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"              echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt"
1230                if test "x$ADM" = xt ; then
1231                    head -1 $dir/$builddir/taf_ad.log >> $CDIR"/summary.txt"
1232                    grep -A3 'Seconds in section "ALL' $dir/tr_run.$ex/$OUTPUTFILE \
1233                                       >> $CDIR"/summary.txt"
1234                fi
1235              if test "x$POSTCLEAN" = xt ; then              if test "x$POSTCLEAN" = xt ; then
1236                  run_clean $dir/tr_run.$ex                  run_clean $dir/tr_run.$ex
1237              fi              fi
1238          done          done
 #   else  
 #       fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`  
 #       fres=$fres"$results   $dir"  
 #       echo  
 #       echo "$fres" >> $SUMMARY  
 #       touch $CDIR"/summary.txt"  
 #       echo "fresults='$fres'" >> $CDIR"/summary.txt"  
 #       echo "MACH='$MACH'" >> $CDIR"/summary.txt"  
 #       echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt"  
 #       echo "DATE='$DATE'" >> $CDIR"/summary.txt"  
 #       echo "tdir='$dir'" >> $CDIR"/summary.txt"  
 #   fi  
     if test "x$ADM" = xt ; then  
         grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \  
                            >> $CDIR"/summary.txt"  
     fi  
1239    
1240      #postclean $dir/$builddir      #postclean $dir/$builddir
1241      if test "x$POSTCLEAN" = xt ; then      if test "x$POSTCLEAN" = xt ; then
# Line 1317  fi Line 1282  fi
1282  rm -f tr_cmpnum.c tr_cmpnum  rm -f tr_cmpnum.c tr_cmpnum
1283    
1284  if test "x$CLEANUP" != xt ; then  if test "x$CLEANUP" != xt ; then
1285      cat $SUMMARY | sed 's/  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.//'      cat $SUMMARY | sed 's/ \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \.  \. //'
1286      if test -e tr_out.txt ; then      if test -e tr_out.txt ; then
1287          mv tr_out.txt tr_out.txt.old          mv tr_out.txt tr_out.txt.old
1288      fi      fi
1289      cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/  \.//g' > tr_out.txt      cat $SUMMARY | sed '/^[YN] [YN] [YN] [YN]/ s/ \. //g' > tr_out.txt
1290  fi  fi
1291    
1292  if test "x$DELDIR" = xt ; then  if test "x$DELDIR" = xt ; then
Legend:
Removed from v.1.101  
changed lines
  Added in v.1.112
  ViewVC Help
Powered by ViewVC 1.1.22