--- MITgcm/verification/testreport	2010/11/03 19:28:18	1.147
+++ 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.147 2010/11/03 19:28:18 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"
@@ -365,7 +367,7 @@
 	    if test "x$RETVAL" != x0 ; then
 		tail genmake.tr_log
 		echo "genmakemodel: genmake failed"
-		cp genmake_* genmake.tr_log $CDIR
+		cp genmake.log genmake_* genmake.tr_log $CDIR
 		return 1
 	    else
 		echo "successful"
@@ -392,7 +394,7 @@
 		if test "x$RETVAL" != x0 ; then
 		    tail make.tr_log
 		    echo "makeclean: \"make Clean\" failed"
-		    cp make.tr_log $CDIR"/make.tr_log"
+		    cp make.tr_log genmake.log genmake.tr_log $CDIR
 		    return 1
 		fi
 		echo successful
@@ -441,7 +443,7 @@
 	    if test "x$RETVAL" != x0 ; then
 		tail make.tr_log
 		echo "makedependmodel: make depend failed"
-		cp make.tr_log $CDIR"/make.tr_log"
+		cp make.tr_log genmake.log genmake.tr_log $CDIR
 		return 1
 	    else
 		echo successful
@@ -481,7 +483,7 @@
 	    if test "x$RETVAL" != x0 ; then
 		tail make.tr_log
 		echo failed
-		cp make.tr_log $CDIR"/make.tr_log"
+		cp make.tr_log genmake.log genmake.tr_log $CDIR
 		rm -f $EXECUTABLE
 		return 1
 	    else
@@ -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