--- MITgcm/verification/testreport	2004/03/12 02:44:34	1.34
+++ MITgcm/verification/testreport	2004/03/12 19:55:47	1.38
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.34 2004/03/12 02:44:34 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.38 2004/03/12 19:55:47 edhill Exp $
 #  $Name:  $
 #
 
@@ -413,7 +413,10 @@
 	cd $1
 	printf 'runmodel ... ' 1>&2
 	# make output.txt
-	$COMMAND >> run.log 2>&1
+	echo
+	echo "COMMAND='$COMMAND'"
+	echo "pwd='"`pwd`"'"
+	( eval $COMMAND ) >> run.log 2>&1
 	RETVAL=$?
 	if test "x$RETVAL" = x0 ; then
 	    echo successful 1>&2
@@ -858,28 +861,29 @@
 	echo "DATE='$DATE'" >> $CDIR"/summary.txt"
 	echo "tdir='$dir'" >> $CDIR"/summary.txt"
 
+	OLD_COMMAND=$COMMAND
+	COMMAND="./mitgcmuv > output.txt"
 	for ex in $extra_runs ; do
 	    test -e "$dir/tr_run" && rm -rf "$dir/tr_run"
 	    mkdir "$dir/tr_run"
-	    ( cd "$dir/input" ; links=`ls -1 | grep -v CVS` )
+	    links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
 	    (
 		cd "$dir/tr_run"
 		for i in $links; do
 		    ln -s ../input/$i $i
 		done
 	    )
-	    ( cd "$dir/input.$ex" ; links=`ls -1 | grep -v CVS` )
+	    links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )`
 	    ( 
 		cd "$dir/tr_run"
 		for i in $links; do
 		    test -e $i  &&  rm -f $i
 		    ln -s ../input.$ex/$i $i
 		done
-		ln -s ../$builddir/Makefile Makefile
 		ln -s ../$builddir/mitgcmuv mitgcmuv
 	    )
 	    runmodel $dir/tr_run && run=Y \
-		&& results=`testoutput $dir $rundir "."$ex`
+		&& results=`testoutput $dir tr_run "."$ex`
 	    fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
 	    fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results`
 	    fres="$fres.$ex"
@@ -891,6 +895,7 @@
 	    echo "DATE='$DATE'" >> $CDIR"/summary.txt"
 	    echo "tdir='$dir'" >> $CDIR"/summary.txt"
 	done
+	COMMAND=$OLD_COMMAND
     else
 	fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}`
 	fres=$fres"$results   $dir"