X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=9ab5e0d9705d0b43c66eeefc7ea59e168028e128;hp=42bb9b5720becb140dad69665b0a00a05e2eea7d;hb=29d909009d47c52c5f02630658f7422c634230ab;hpb=83331f7e23838262be61e8ec2d78abcffd1a077e diff --git a/validate b/validate index 42bb9b5..9ab5e0d 100644 --- a/validate +++ b/validate @@ -11,8 +11,9 @@ if [ -f mk/build.mk ]; then fi # The default is a "quick" build -echo BuildFlavour=quick >mk/build.mk -cat mk/build.mk.sample >>mk/build.mk +echo BuildFlavour=quick > mk/build.mk +echo HADDOCK_DOCS=YES >> mk/build.mk +cat mk/build.mk.sample >> mk/build.mk # You can override the default validate settings using mk/validate.mk # e.g. you could add GhcLibWays=p to test profiling. @@ -27,13 +28,9 @@ case $OSTYPE in esac if [ "$CPUS" = "" ]; then - # ToDo: make -j doesn't work in libraries/ on Windows (see #1559) - case $OSTYPE in - cygwin|msys) threads=1;; - *) threads=2;; - esac + threads=2 else - threads=`expr $CPUS + 1` + threads=`expr $CPUS + 1` fi sh boot @@ -49,7 +46,7 @@ if grep '\<0 unexpected passes' testlog >/dev/null 2>/dev/null && grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null ; then echo "-------------------------------------------------------------------" - echo "Congratulations! This tree is has passed minimal testing." + echo "Congratulations! This tree has passed minimal testing." echo echo "NOTE: If you have made changes that may cause failures not tested" echo "for by the minimal testing procedure, please do further testing"