/[MITgcm]/MITgcm/tools/do_tst_2+2

Diff of /MITgcm/tools/do_tst_2+2

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.1 by jmc,
Tue Dec 25 22:10:51 2007 UTC
+revision 1.3 by jmc,
Fri Feb 27 22:58:57 2009 UTC
 Line 1
- #!/bin/sh
+ #! /usr/bin/env bash
  # $Header$
  # $Name$
 Line 12 
 usage()
          echo "  -help         : print usage"
          echo "  -t   LIST_EXP : only check experiments in LIST_EXP"
          echo "  -skd LIST_EXP : skip experiments in LIST_EXP"
-         echo "  (-o) STRING   : used to build output directory name"
+         echo "  -exe  COMMAND : use COMMAND to run the tests"
+         echo "  -mpi          : run the tests using MPI"
+         echo "  -o     STRING : used to build output directory name"
          echo "                      (DEF=\"hostname\")"
-         echo "  (-a) STRING   : email address to send output to"
+         echo "  -a,-A  STRING : email address to send output to"
          echo "                      (DEF=\"\" no email is sent)"
+         echo "                      (-A: + save each log file)"
          echo "  -clean        : clean output & reset"
          exit
  }
-Line 23 
 usage()
+Line 26 
 usage()
  CLEAN=0
  TESTDIRS=
  SKIPDIRS=
+ SCRIPT='../tools/tst_2+2'
+ COMMAND=
+ mpi=0
  OUTDIR=`hostname`
+ SAVELOG=0
  ADDRESS=
- SCRIPT='../tools/tst_2+2'
  MPACK="../tools/mpack-1.6/mpack"
  here=`pwd`
  yy=
-Line 40 
 do
+Line 46 
 do
        -clean) CLEAN=1 ;;
        -t    ) yy=TESTDIRS ;;
        -skd  ) yy=SKIPDIRS ;;
+       -exe  ) yy=COMMAND ;;
+       -mpi  ) mpi=1 ;;
        -a    ) yy=ADDRESS ;;
+       -A    ) yy=ADDRESS ; SAVELOG=1 ;;
        -o    ) yy=OUTDIR ;;
          *) echo "Error: unrecognized option: "$xx ; usage ; exit ;;
        esac
-Line 48 
 do
+Line 57 
 do
  done
  #------------------------
- if test "x$TESTDIRS" = x
+ if test "x$TESTDIRS" = x ; then TESTDIRS=`ls ` ; fi
- then
-  TESTDIRS=`ls `
- fi
  LIST=""
  for xx in $TESTDIRS
  do
    yy=`echo $SKIPDIRS | grep -c $xx`
    if test $yy = 0 ; then
-     if test -f $xx/results/output.txt
+     if test -f $xx/results/output.txt ; then
-     then
         LIST=${LIST}" "$xx
  #   else
  #      echo ""; echo -n " -- skip \"$xx\" (not a directory !)"
-Line 71 
 done
+Line 76 
 done
  if test -x $SCRIPT ; then
   echo "run script '$SCRIPT' for experiment in:"
   echo " $LIST"
   yy=`echo $SCRIPT | grep -c '^\/'`
   if test $yy = 0 ; then SCRIPT="../../$SCRIPT" ; fi
  else
   echo "ERROR: script '$SCRIPT' not found or not executable"
-Line 86 
 if test $CLEAN = 1 ; then
+Line 91 
 if test $CLEAN = 1 ; then
    listD='run '`(cd $xx/results ; ls output.*.txt 2> /dev/null | sed 's/^output\./tr_run./g' | sed 's/\.txt$//g' )`
    for yy in $listD
    do
-     if test -r $xx/$yy/data.tst
+     if test -r $xx/$yy/data.tst ; then
-     then
        echo "clean dir:" $xx/$yy
        cd $xx/$yy
        echo ' ' >> outp.tst_2+2.log
        echo $SCRIPT 4 >> outp.tst_2+2.log
        $SCRIPT 4 >> outp.tst_2+2.log 2>&1
-Line 130 
 echo  >> $SUMMARY
+Line 134 
 echo  >> $SUMMARY
  echo 'P. Run  Result     experiment'  >> $SUMMARY
  echo '  1 2 3'  >> $SUMMARY
+ #-- For MPI test:
+ RUNOUTP="output.txt"
+ if [ $mpi -ge 1 ] ; then
+   SCRIPT="$SCRIPT -mpi"
+   RUNOUTP="STDOUT.0000"
+ fi
  for xx in $LIST
  do
    echo ==============================================================================
    listD='run '`(cd $xx/results ; ls output.*.txt 2> /dev/null | sed 's/^output\./tr_run./g' | sed 's/\.txt$//g' )`
    for yy in $listD
    do
-     if test -f $xx/$yy/output.txt
+     if test -f $xx/$yy/$RUNOUTP ; then
-     then
        if test "x$OPTFILE" = x -a -f $xx/build/Makefile ; then
          comm=`grep '^# OPTFILE=' $xx/build/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
          echo "from '$xx/build/Makefile', extract:" > $DRESULTS/genmake_state
          echo $comm >> $DRESULTS/genmake_state
          eval $comm
        fi
        if test $yy = 'run' ; then nam=$xx
        else nam=$xx`echo $yy | sed 's/tr_run//'` ; fi
        echo -n "Entering $xx/$yy :"
        cd $xx/$yy
-       echo $SCRIPT All > outp.tst_2+2.log ; echo ' ' >> outp.tst_2+2.log
+       pwd > outp.tst_2+2.log
-       $SCRIPT All >> outp.tst_2+2.log 2>&1
+       if test "x$COMMAND" = x ; then
-       out=$?
+         echo $SCRIPT All >> outp.tst_2+2.log ; echo ' ' >> outp.tst_2+2.log
+         $SCRIPT All >> outp.tst_2+2.log 2>&1
+         out=$?
+       else
+         echo "$SCRIPT All -command \"$COMMAND\"" >> outp.tst_2+2.log
+         echo ' ' >> outp.tst_2+2.log
+         $SCRIPT All -command "$COMMAND" >> outp.tst_2+2.log 2>&1
+         out=$?
+       fi
        case $out in
 ) echo ' pass test 2+2=4'
             echo "Y Y Y Y  pass   <- $nam" >> ../../$SUMMARY ;;
-Line 160 
 do
+Line 178 
 do
 ) echo "Y N N N FAIL ($out) - $nam" >> ../../$SUMMARY ;;
         * ) echo "N N N N FAIL ($out) - $nam" >> ../../$SUMMARY ;;
        esac
-       if test $out != '0'
+       if test $out != '0' ; then
-       then
          echo " test 2+2=4 FAIL (exit $out)"
          echo " "
          tail -5 outp.tst_2+2.log
          echo " "
+         cp -p outp.tst_2+2.log ../../$DRESULTS/$nam.log
+       elif test $SAVELOG = 1 ; then
+         cp -p outp.tst_2+2.log ../../$DRESULTS/$nam.log
        fi
        cd $here
      fi

 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.3
 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.3
-Removed from v.1.1
+Added in v.1.3

	ViewVC Help
Powered by ViewVC 1.1.22