--- MITgcm/verification/testreport	2004/07/12 14:02:25	1.44
+++ MITgcm/verification/testreport	2004/08/03 02:48:57	1.47
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.44 2004/07/12 14:02:25 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.47 2004/08/03 02:48:57 edhill Exp $
 #  $Name:  $
 #
 
@@ -237,7 +237,7 @@
 	    $command > make.log 2>&1
 	    RETVAL=$?
 	    #  Reduce the size of the testing emails!
-	    #  cp Makefile $CDIR
+	    head -100 Makefile > $CDIR/Makefile_head
 	    if test "x$RETVAL" != x0 ; then
 		tail make.log
 		echo "genmakemodel: genmake failed" 1>&2
@@ -340,7 +340,7 @@
     code_dir=$2
     BUILD_DIR=$dir/$3
     CODE_DIR=$dir/$code_dir
-
+    
     # These are files that should replace their counter-part when using -mpi
     MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")`
 
@@ -355,20 +355,21 @@
 	    RETVAL=$?
 	    if test "x$RETVAL" != x0 ; then
 		if ! test -f $BUILD_DIR/$i ; then
-	        #echo Linking $name to $i
+	            #echo Linking $name to $i
 		    (cd $BUILD_DIR; ln -sf ../$code_dir/$i $name)
 		fi
 	    fi
 	done
     else
-    # NO: We undo any _mpi symbolically linked files
+        # NO: We undo any _mpi symbolically linked files
 	for ii in $MPI_FILES ; do
 	    i=`echo $ii | sed 's:^\./::'`
 	    name=`echo $i | sed 's:_mpi::' `
 	    if test -L $BUILD_DIR/$name ; then
-		linktarg=`(cd $BUILD_DIR; readlink $name)`
-		if test $linktarg = "../$code_dir/$name"_mpi ; then
-	        #echo Un-linking $name from $linktarg
+		cmp $BUILD_DIR/$name "../$code_dir/$name"_mpi > /dev/null 2>&1
+		RETVAL=$?
+		if test "x$RETVAL" = x0 ; then
+		    #echo Un-linking $name from $linktarg
 		    rm -f $BUILD_DIR/$name
 		fi
 	    fi
@@ -421,11 +422,13 @@
 	printf 'runmodel ... ' 1>&2
 	# make output.txt
 	echo
+	rm -f run.log
 	# echo "COMMAND='$COMMAND'"
 	# echo "pwd='"`pwd`"'"
-	( eval $COMMAND ) >> run.log 2>&1
+	( eval $COMMAND ) > run.log 2>&1
 	RETVAL=$?
 	if test "x$RETVAL" = x0 ; then
+	    tail run.log
 	    echo successful 1>&2
 	    # === Reduce the size of the testing emails!
 	    # if test "x$ADM" = x ; then
@@ -690,7 +693,7 @@
 fi
 
 if test "x$COMMAND" = x ; then
-    COMMAND="make output.txt"
+    COMMAND="$MAKE output.txt"
 fi
 
 echo "OK"