--- MITgcm/verification/testreport	2010/11/01 00:25:16	1.144
+++ MITgcm/verification/testreport	2010/11/02 22:53:11	1.146
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.144 2010/11/01 00:25:16 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.146 2010/11/02 22:53:11 jmc Exp $
 #  $Name:  $
 #
 
@@ -358,14 +358,14 @@
 	    fi
 	    fi
 	    printf 'genmake ... '
-	    eval $command > make.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 make.log
+		tail genmake.tr_log
 		echo "genmakemodel: genmake failed"
-		cp genmake_* make.log $CDIR
+		cp genmake_* genmake.tr_log $CDIR
 		return 1
 	    else
 		echo "successful"
@@ -377,6 +377,7 @@
 makeclean()
 {
     # makeclean directory
+    if test "x$NODEPEND" = xf ; then rm -f $1/make.tr_log ; fi
     if test "x$NOCLEAN" = xt ; then
 	echo "make Clean skipped!"
     else
@@ -385,12 +386,13 @@
 	    #if test -e $OUTPUTFILE ; then rm -f $OUTPUTFILE ; fi
 	    if test -r Makefile ; then
 		printf 'clean build-dir: make Clean ... '
-		$MAKE Clean >> make.log 2>&1
+		rm -f Makefile.old
+		$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 $CDIR"/make.tr_log"
 		    return 1
 		fi
 		echo successful
@@ -416,7 +418,7 @@
 	    find . -name "*.data" -exec rm {} \;
 	    find . -name "fort.*" -exec rm {} \;
 	    find . -type l -exec rm {} \;
-	    rm -f $EXECUTABLE *.txt STD* *diagnostics.log datetime
+	    rm -f $EXECUTABLE $RUNLOG *.txt STD* *diagnostics.log datetime
 	    rm -rf mnc_test_*
  	    rm -f *_MIT_CE_000.opt0000 costfunction*0000
 	    echo successful
@@ -434,12 +436,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 $CDIR"/make.tr_log"
 		return 1
 	    else
 		echo successful
@@ -465,21 +467,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 $CDIR"/make.tr_log"
 		rm -f $EXECUTABLE
 		return 1
 	    else
@@ -1064,7 +1066,7 @@
     OPTFILE=$MITGCM_OF
 fi
 
-RUNLOG="run.log"
+RUNLOG="run.tr_log"
 OUTPUTFILE=$ref_outp
 if test "x$COMMAND" = x ; then
     COMMAND="./$EXECUTABLE > $OUTPUTFILE"
@@ -1224,9 +1226,11 @@
     if test "x$CLEANUP" = xt ; then
 	echo -n '  --- dir:' $BUILD_DIR ': '
 	makeclean $BUILD_DIR
-        rm -f $BUILD_DIR/$EXECUTABLE
-        rm -f $BUILD_DIR/genmake_state $BUILD_DIR/genmake_*optfile
-        rm -f $BUILD_DIR/genmake_warnings $BUILD_DIR/genmake_errors
+	(   cd $BUILD_DIR
+	    rm -f $EXECUTABLE *.bak
+	    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 ': '
 	    run_clean $dir/$rundir