shift
done
-if [ "$CPUS" = "" ]; then
- threads=2
+if [ "$THREADS" = "" ]; then
+ if [ "$CPUS" = "" ]; then
+ threads=2
+ else
+ threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ fi
+else
+ threads="$THREADS"
+fi
+
+if type gmake > /dev/null 2> /dev/null
+then
+ make="gmake"
else
- threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+ make="make"
fi
if [ $testsuite_only -eq 0 ]; then
if [ $no_clean -eq 0 ]; then
- if [ -f mk/config.mk ]; then
- make distclean
- fi
+ $make maintainer-clean NO_CLEAN_GMP=YES
INSTDIR=`pwd`/inst
if [ "$OSTYPE" = "cygwin" ]
then
INSTDIR=`cygpath -m "$INSTDIR"`
fi
- case $OSTYPE in
- cygwin|msys) config_args=--build=i386-unknown-mingw32
- if [ -f c:/mingw/bin/gcc.exe ]
- then
- config_args="$config_args --with-gcc=c:/mingw/bin/gcc"
- fi
- if [ -f c:/mingw/bin/ld.exe ]
- then
- config_args="$config_args --with-ld=c:/mingw/bin/ld"
- fi
- ;;
- esac
- sh boot
+ /usr/bin/perl -w boot --validate --required-tag=dph
./configure --prefix="$INSTDIR" $config_args
fi
-thisdir=`utils/pwd/pwd`
+thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
echo "Validating=YES" > mk/are-validating.mk
-make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
+
+#
+# Install the mtl package into the bindist, because it is used by some
+# tests. It isn't essential that we do this (the failing tests will
+# be treated as expected failures), but we get a bit more test
+# coverage, and also verify that we can install a package into the
+# bindist with Cabal.
+#
+bindistdir="bindisttest/install dir"
+cd libraries/mtl
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs configure --with-ghc="$thisdir/$bindistdir/bin/ghc" --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs build --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs install --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs clean --builddir=dist-bindist
+cd $thisdir
+
fi # testsuite-only
if [ "$hpc" = YES ]
rm -f $HPCTIXFILE
fi
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
+
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
if [ "$hpc" = YES ]
then
that it is OK before pushing.
EOF
fi
+ cat <<EOF
+-------------------------------------------------------------------
+EOF
else
cat <<EOF
I didn't find any problems, but this wasn't a complete validate run,
NOTE: If you have made changes that may cause failures not tested for by
the minimal testing procedure, please do further testing as necessary.
+-------------------------------------------------------------------
EOF
fi
else
cat <<EOF
Oops! Looks like you have some unexpected test results or framework failures.
Please fix them before pushing/sending patches.
+-------------------------------------------------------------------
EOF
+ exit 1
fi
-echo "-------------------------------------------------------------------"