--- MITgcm/verification/testreport 2004/07/08 15:47:19 1.42 +++ MITgcm/verification/testreport 2004/07/12 14:02:25 1.44 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.42 2004/07/08 15:47:19 jmc Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.44 2004/07/12 14:02:25 edhill Exp $ # $Name: $ # @@ -27,6 +27,7 @@ echo " (DEF=\"make output.txt\")" echo " (-m|-make) STRING command to use for \"make\"" echo " (DEF=\"make\")" + echo " (-j) JOBS use \"make -j JOBS\" for parallel builds" echo " (-clean) *ONLY* run \"make CLEAN\"" echo " (-quick|-q) same as \"-nogenmake -noclean -nodepend\"" echo " (-nogenmake|-ng) skip the genmake stage" @@ -235,7 +236,8 @@ printf 'genmake ... ' 1>&2 $command > make.log 2>&1 RETVAL=$? - cp Makefile $CDIR + # Reduce the size of the testing emails! + # cp Makefile $CDIR if test "x$RETVAL" != x0 ; then tail make.log echo "genmakemodel: genmake failed" 1>&2 @@ -307,7 +309,11 @@ if test -r Makefile ; then printf 'make ... ' 1>&2 if test "x$ADM" = x ; then - $MAKE >> make.log 2>&1 + if test "x$JOBS" = x ; then + $MAKE >> make.log 2>&1 + else + $MAKE -j $JOBS >> make.log 2>&1 + fi else $MAKE adall >> make.log 2>&1 fi @@ -421,11 +427,12 @@ RETVAL=$? if test "x$RETVAL" = x0 ; then echo successful 1>&2 - if test "x$ADM" = x ; then - cp output.txt $CDIR"/output.txt" - else - cp output.txt_adm $CDIR"/output.txt_adm" - fi + # === Reduce the size of the testing emails! + # if test "x$ADM" = x ; then + # cp output.txt $CDIR"/output.txt" + # else + # cp output.txt_adm $CDIR"/output.txt_adm" + # fi return 0 else tail run.log @@ -567,6 +574,7 @@ MPACK="$MPACKDIR/mpack" COMMAND= MAKE=make +JOBS= MPI=f DELDIR= @@ -621,6 +629,9 @@ -make=* | --make=*) MAKE=$ac_optarg ;; + -j) ac_prev=JOBS ;; + -j=*) JOBS=$ac_optarg ;; + -clean | --clean) CLEANUP=t ;; @@ -929,7 +940,7 @@ if test "x$HAVE_MPACK" = xt ; then tar -cf $DRESULTS".tar" $DRESULTS > /dev/null 2>&1 \ && gzip $DRESULTS".tar" \ - && $MPACK -s MITgcm-test -m 1500000 $DRESULTS".tar.gz" $ADDRESSES + && $MPACK -s MITgcm-test -m 3555000 $DRESULTS".tar.gz" $ADDRESSES RETVAL=$? if test "x$RETVAL" != x0 ; then echo