--- MITgcm/verification/testreport 2004/03/12 16:45:38 1.35 +++ MITgcm/verification/testreport 2004/03/29 03:33:52 1.39 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.35 2004/03/12 16:45:38 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.39 2004/03/29 03:33:52 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 @@ -863,14 +866,14 @@ 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 @@ -880,7 +883,7 @@ 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"