--- MITgcm/verification/testreport	2010/11/02 00:55:40	1.145
+++ MITgcm/verification/testreport	2010/12/14 18:45:52	1.150
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.145 2010/11/02 00:55:40 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.150 2010/12/14 18:45:52 jmc Exp $
 #  $Name:  $
 #
 
@@ -25,6 +25,8 @@
     echo "  (-tdir|-t) STRING        list of group and/or exp. dirs to test"
     echo "                             (recognized groups: basic, tutorials)"
     echo "                             (DEF=\"\" which test all)"
+    echo "                             (if list= 'start_from THIS_EXP' then"
+    echo "                              test THIS_EXP + all the following)"
     echo "  (-skipdir|-skd) STRING   list of exp. dirs to skip"
     echo "                             (DEF=\"\" which test all)"
     echo "  (-bash|-b) STRING        preferred location of a \"bash\" or"
@@ -358,14 +360,14 @@
 	    fi
 	    fi
 	    printf 'genmake ... '
-	    eval $command > genmake.log 2>&1
+	    eval $command > genmake.tr_log 2>&1
 	    RETVAL=$?
 	    #  Reduce the size of the testing emails!
 	    head -100 Makefile > $CDIR/Makefile_head
 	    if test "x$RETVAL" != x0 ; then
-		tail genmake.log
+		tail genmake.tr_log
 		echo "genmakemodel: genmake failed"
-		cp genmake_* genmake.log $CDIR
+		cp genmake.log genmake_* genmake.tr_log $CDIR
 		return 1
 	    else
 		echo "successful"
@@ -377,7 +379,7 @@
 makeclean()
 {
     # makeclean directory
-    if test "x$NODEPEND" = xf ; then rm -f $1/make.log ; fi
+    if test "x$NODEPEND" = xf ; then rm -f $1/make.tr_log ; fi
     if test "x$NOCLEAN" = xt ; then
 	echo "make Clean skipped!"
     else
@@ -387,12 +389,12 @@
 	    if test -r Makefile ; then
 		printf 'clean build-dir: make Clean ... '
 		rm -f Makefile.old
-		$MAKE Clean >> make.log 2>&1
+		$MAKE Clean >> make.tr_log 2>&1
 		RETVAL=$?
 		if test "x$RETVAL" != x0 ; then
-		    tail make.log
+		    tail make.tr_log
 		    echo "makeclean: \"make Clean\" failed"
-		    cp make.log $CDIR"/make.log"
+		    cp make.tr_log genmake.log genmake.tr_log $CDIR
 		    return 1
 		fi
 		echo successful
@@ -436,12 +438,12 @@
 	(
 	    cd $1;
 	    printf 'make depend ... '
-	    $MAKE depend >> make.log 2>&1
+	    $MAKE depend >> make.tr_log 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
-		tail make.log
+		tail make.tr_log
 		echo "makedependmodel: make depend failed"
-		cp make.log $CDIR"/make.log"
+		cp make.tr_log genmake.log genmake.tr_log $CDIR
 		return 1
 	    else
 		echo successful
@@ -467,21 +469,21 @@
 	if test -r Makefile ; then
 	    printf 'make ... '
 	    if test "x$ADM" = xt ; then
-		$MAKE adall >> make.log 2>&1
+		$MAKE adall >> make.tr_log 2>&1
 	    elif test "x$OADM" = xt ; then
-		$MAKE adAll >> make.log 2>&1
+		$MAKE adAll >> make.tr_log 2>&1
             else
 		if test "x$JOBS" = x ; then
-		    $MAKE >> make.log 2>&1
+		    $MAKE >> make.tr_log 2>&1
 		else
-		    $MAKE -j $JOBS >> make.log 2>&1
+		    $MAKE -j $JOBS >> make.tr_log 2>&1
 		fi
 	    fi
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
-		tail make.log
+		tail make.tr_log
 		echo failed
-		cp make.log $CDIR"/make.log"
+		cp make.tr_log genmake.log genmake.tr_log $CDIR
 		rm -f $EXECUTABLE
 		return 1
 	    else
@@ -855,7 +857,7 @@
 # list of pTracers to check for monitor output
 PTRACERS_NUM="1 2 3 4 5"
 
-MATCH_CRIT=13
+MATCH_CRIT=10
 
 printf "parsing options...  "
 
@@ -1066,7 +1068,7 @@
     OPTFILE=$MITGCM_OF
 fi
 
-RUNLOG="run.log"
+RUNLOG="run.tr_log"
 OUTPUTFILE=$ref_outp
 if test "x$COMMAND" = x ; then
     COMMAND="./$EXECUTABLE > $OUTPUTFILE"
@@ -1228,8 +1230,8 @@
 	makeclean $BUILD_DIR
 	(   cd $BUILD_DIR
 	    rm -f $EXECUTABLE *.bak
-	    rm -f genmake_state genmake_*optfile genmake_warnings genmake_errors
-	    rm -f genmake.log make.log
+	    rm -f genmake_state genmake_*optfile genmake.log
+	    rm -f genmake.tr_log make.tr_log
 	)
 	if test -d $dir/$rundir/CVS ; then
             echo -n '  --- dir:' $dir/$rundir ': '
@@ -1391,6 +1393,20 @@
 	    echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
 	    sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
 	    echo $mkOpt >> $DRESULTS/genmake_state
+	    gmkLog=$dir/$builddir/genmake.log
+	    grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
+	    RETVAL=$?
+	    if test "x$RETVAL" = x0 ; then
+		echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state
+		sed -n '/Get compiler version/,/--- compiler version/p' $gmkLog | \
+		       grep -v '^... compiler version ' > tr_vers.tmp_log
+		grep -i 'version ' tr_vers.tmp_log >> $DRESULTS/genmake_state
+		RETVAL=$?
+		if test "x$RETVAL" != x0 ; then
+		   cat tr_vers.tmp_log >> $DRESULTS/genmake_state
+		fi
+		rm -f tr_vers.tmp_log
+	    fi
 	fi
     fi
     #postclean $dir/$builddir