diff --git a/scripts/fullcheck.sh b/scripts/fullcheck.sh index 7b7cf2b95f4e76ba528f19109778ef0c30bb371e..2fa0f2c39b3891389e446ff732976a9980dca500 100755 --- a/scripts/fullcheck.sh +++ b/scripts/fullcheck.sh @@ -10,8 +10,8 @@ if test \( $# -lt 1 \) -o ! -e $1/$DUNECONTROL ; then exit 1 fi -echo "Full Check of dune-femo-dg" -echo "--------------------------" +echo "Full Check of dune-fem-dg" +echo "-------------------------" echo echo "Host Name: $HOSTNAME" @@ -92,35 +92,51 @@ do fi done -# build tarballs -# -------------- +# perform make check +# ------------------ -for MODULE in $MODULES ; do - # ignore missing modules since istl may be missing - if ! test -d $DUNEDIR/$MODULE ; then - continue; - fi - - echo - echo "Making tarball in $MODULE..." - - cd $DUNEDIR/$MODULE - find -maxdepth 1 -name "*.tar.gz" -delete - if ! make dist &> $WORKINGDIR/$MODULE-dist.out ; then - echo "Error: Cannot make tarball for $MODULE (see $WORKINGDIR/$MODULE-dist.out)" - if test $MODULE == dune-fem ; then - errors=$((errors+1)) - fi - fi -done +CHECKLOG="$WORKINGDIR/minimal-check.out" -# check distributions -# ------------------- +MAKE_CHECK_FLAGS="" +MAKE_CHECK_FLAGS="$(source $OPTSDIR/$OPTS; echo $MAKE_CHECK_FLAGS)" -cd $WORKINGDIR -if ! $SCRIPTSDIR/check-dist.sh $DUNEDIR ; then +if ! $SCRIPTSDIR/check-tests.sh $TESTDIR/dune-fem "$MAKE_CHECK_FLAGS"; then + echo "Error: Check failed with minimal options (see $CHECKLOG)" errors=$((errors+1)) fi +mv $WORKINGDIR/check-tests.out $CHECKLOG + + + +## build tarballs +## -------------- +# +#for MODULE in $MODULES ; do +# # ignore missing modules since istl may be missing +# if ! test -d $DUNEDIR/$MODULE ; then +# continue; +# fi +# +# echo +# echo "Making tarball in $MODULE..." +# +# cd $DUNEDIR/$MODULE +# find -maxdepth 1 -name "*.tar.gz" -delete +# if ! make dist &> $WORKINGDIR/$MODULE-dist.out ; then +# echo "Error: Cannot make tarball for $MODULE (see $WORKINGDIR/$MODULE-dist.out)" +# if test $MODULE == dune-fem ; then +# errors=$((errors+1)) +# fi +# fi +#done +# +## check distributions +## ------------------- +# +#cd $WORKINGDIR +#if ! $SCRIPTSDIR/check-dist.sh $DUNEDIR ; then +# errors=$((errors+1)) +#fi if test $errors -gt 0 ; then exit 1 diff --git a/scripts/opts/minimal.opts b/scripts/opts/minimal.opts index a868906d5cfcb51cb016a4ac0c26a41e0271f049..e3332174df8c67404504f9cdfe5abea5bbdf2f9a 100644 --- a/scripts/opts/minimal.opts +++ b/scripts/opts/minimal.opts @@ -1,6 +1,24 @@ -CONFIGURE_FLAGS="--disable-documentation \ +# use these options for configure if no options a provided on the cmdline +# #AUTOGEN_FLAGS="--ac=2.59 --am=-1.8" +MODULEDIR=/hosts/raid5/aragorn/dune/modules/$HOSTTYPE +CONFIGURE_FLAGS="\ +--enable-experimental-grid-extensions \ --enable-fieldvector-size-is-method \ --without-gmp \ ---enable-experimental-grid-extensions" +--enable-parallel \ +--with-petsc=$MODULEDIR/petsc \ +--prefix=/hosts/gandalf/raid5/morgoth/dune/src/dune \ +--with-alberta=$MODULEDIR/alberta \ +--x-includes=/usr/X11R6/include \ +--x-libraries=/usr/X11R6/lib \ +--enable-fieldvector-size-is-method \ +--disable-documentation \ +--with-grape=$MODULEDIR/grape" MAKE_FLAGS= + + +# These flags are necessary to perform grid specific checks! +MAKE_CHECK_FLAGS="GRIDTYPE=ALUGRID_SIMPLEX GRIDDIM=3" +MAKE_CHECK_DEPS="dune-alugrid" + MAKE_FLAGS=-j8