--- MITgcm/tools/do_tst_2+2	2009/02/27 22:58:57	1.3
+++ MITgcm/tools/do_tst_2+2	2010/03/25 23:09:29	1.6
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/do_tst_2+2,v 1.3 2009/02/27 22:58:57 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()
@@ -27,9 +27,10 @@
 TESTDIRS=
 SKIPDIRS=
 SCRIPT='../tools/tst_2+2'
+scrArg='All'
 COMMAND=
 mpi=0
-OUTDIR=`hostname`
+OUTDIR=`hostname | sed 's/\..*$//'`
 SAVELOG=0
 ADDRESS=
 MPACK="../tools/mpack-1.6/mpack"
@@ -151,6 +152,7 @@
       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
@@ -160,13 +162,13 @@
       cd $xx/$yy
       pwd > outp.tst_2+2.log
       if test "x$COMMAND" = x ; then
-        echo $SCRIPT All >> outp.tst_2+2.log ; echo ' ' >> outp.tst_2+2.log
-        $SCRIPT All >> outp.tst_2+2.log 2>&1
+        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 All -command \"$COMMAND\"" >> outp.tst_2+2.log
+        echo "$SCRIPT $scrArg -command \"$COMMAND\"" >> outp.tst_2+2.log
         echo ' ' >> outp.tst_2+2.log
-        $SCRIPT All -command "$COMMAND" >> outp.tst_2+2.log 2>&1
+        $SCRIPT $scrArg -command "$COMMAND" >> outp.tst_2+2.log 2>&1
         out=$?
       fi
       case $out in