--- MITgcm/tools/do_tst_2+2	2007/12/25 22:10:51	1.1
+++ MITgcm/tools/do_tst_2+2	2010/03/25 23:09:29	1.6
@@ -1,6 +1,6 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/do_tst_2+2,v 1.1 2007/12/25 22:10:51 jmc Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/do_tst_2+2,v 1.6 2010/03/25 23:09:29 jmc Exp $
 # $Name:  $
 
 usage()
@@ -12,10 +12,13 @@
         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
 }
@@ -23,9 +26,13 @@
 CLEAN=0
 TESTDIRS=
 SKIPDIRS=
-OUTDIR=`hostname`
-ADDRESS=
 SCRIPT='../tools/tst_2+2'
+scrArg='All'
+COMMAND=
+mpi=0
+OUTDIR=`hostname | sed 's/\..*$//'`
+SAVELOG=0
+ADDRESS=
 MPACK="../tools/mpack-1.6/mpack"
 here=`pwd`
 yy=
@@ -40,7 +47,10 @@
       -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
@@ -48,17 +58,13 @@
 done
 #------------------------
 
-if test "x$TESTDIRS" = x
-then
- TESTDIRS=`ls `
-fi
+if test "x$TESTDIRS" = x ; 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
-    then
+    if test -f $xx/results/output.txt ; then
        LIST=${LIST}" "$xx
 #   else
 #      echo ""; echo -n " -- skip \"$xx\" (not a directory !)"
@@ -71,7 +77,7 @@
 if test -x $SCRIPT ; then
  echo "run script '$SCRIPT' for experiment in:"
  echo " $LIST"
- yy=`echo $SCRIPT | grep -c '^\/'` 
+ yy=`echo $SCRIPT | grep -c '^\/'`
  if test $yy = 0 ; then SCRIPT="../../$SCRIPT" ; fi
 else
  echo "ERROR: script '$SCRIPT' not found or not executable"
@@ -86,10 +92,9 @@
   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
-    then
+    if test -r $xx/$yy/data.tst ; then
       echo "clean dir:" $xx/$yy
-      cd $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
@@ -130,27 +135,42 @@
 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
-    then
+    if test -f $xx/$yy/$RUNOUTP ; 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
+        sed -n '/^# executed by:/,+1 p' $xx/build/Makefile >> $DRESULTS/genmake_state
         echo $comm >> $DRESULTS/genmake_state
         eval $comm
       fi
-      if test $yy = 'run' ; then nam=$xx 
+      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
-      $SCRIPT All >> outp.tst_2+2.log 2>&1
-      out=$?
+      pwd > outp.tst_2+2.log
+      if test "x$COMMAND" = x ; then
+        echo $SCRIPT $scrArg >> outp.tst_2+2.log ; echo ' ' >> outp.tst_2+2.log
+        $SCRIPT $scrArg >> outp.tst_2+2.log 2>&1
+        out=$?
+      else
+        echo "$SCRIPT $scrArg -command \"$COMMAND\"" >> outp.tst_2+2.log
+        echo ' ' >> outp.tst_2+2.log
+        $SCRIPT $scrArg -command "$COMMAND" >> outp.tst_2+2.log 2>&1
+        out=$?
+      fi
       case $out in
        0 ) echo ' pass test 2+2=4'
            echo "Y Y Y Y  pass   <- $nam" >> ../../$SUMMARY ;;
@@ -160,12 +180,14 @@
        1 ) echo "Y N N N FAIL ($out) - $nam" >> ../../$SUMMARY ;;
        * ) echo "N N N N FAIL ($out) - $nam" >> ../../$SUMMARY ;;
       esac
-      if test $out != '0'
-      then 
+      if test $out != '0' ; 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