--- MITgcm/verification/testreport 2003/09/01 16:50:27 1.2 +++ MITgcm/verification/testreport 2003/09/03 20:02:47 1.4 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.2 2003/09/01 16:50:27 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.4 2003/09/03 20:02:47 edhill Exp $ # usage() @@ -13,6 +13,7 @@ echo " (-optfile=|-of=)STRING list of genmake2 \"optfiles\"" echo " (-a|-addr)STRING list of email recipients" echo " (-t|-tdir)STRING list of \"test\" dirs" + echo " (-b|-bash)STRING location of \"bash\" executable" echo exit 1 } @@ -160,7 +161,7 @@ genmakemodel() { # genmakemodel directory - GENMAKE2="../../../tools/genmake2" + GENMAKE2="$BASH ../../../tools/genmake2" ( cd $1; printf 'genmake ... ' 1>&2 @@ -315,7 +316,7 @@ return 0 else echo - echo "createcodelet: failed to compile codelet" | tee + echo "createcodelet: failed to compile codelet" exit 1 fi } @@ -388,6 +389,7 @@ ieee=1 expts='' +BASH= OPTFILES= ADDRESSES=edhill@mitgcm.org TESTDIRS= @@ -428,6 +430,11 @@ -tdir=* | --tdir=*) TESTDIRS=$ac_optarg ;; + -bash | --bash | -b | --b) + ac_prev=BASH ;; + -bash=* | --bash=*) + BASH=$ac_optarg ;; + -quick) quick=1 ;; -verbose) verbose=2 ;; -debug) debug=1 ;; @@ -505,6 +512,15 @@ # ...and each test directory... for dir in $TESTDIRS ; do + + # Verify that the testdir exists and contains previous + # results in the correct location--or skip this directory! + if test ! -r $dir"/results/output.txt" ; then + echo | tee -a $SUMMARY + echo "can't read \"$dir/results/output.txt\" -- skipping $dir" \ + | tee -a $SUMMARY + continue + fi # Create an output dir for each OPTFILE/tdir combination CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR @@ -530,15 +546,6 @@ rundir=input fi - # Verify that the testdir exists and contains previous - # results in the correct location--or skip this directory! - if test ! -r $dir"/results/output.txt" ; then - echo | tee $SUMMARY - echo "can't read \"$dir/results/output.txt\" -- skipping $dir" \ - | tee $SUMMARY - continue - fi - genmakemodel $dir/$builddir && genmake=Y \ && makeclean $dir/$builddir \ && makedependmodel $dir/$builddir && makedepend=Y \