X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=cb9b307f8aea0ffe1b9fd7b983142177746caa03;hb=395726c5f8e77a01074e775e838658243e39e21c;hp=7949d6299fe04366d1a8cf8e37706ee67cdf1766;hpb=2924c4bc8e4a433c1816695d22319b63a328b418;p=ghc-hetmet.git

diff --git a/validate b/validate
index 7949d62..cb9b307 100644
--- a/validate
+++ b/validate
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ -f mk/config.mk ]; then
    make distclean
@@ -9,8 +11,11 @@ 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
+echo "SRC_HC_OPTS += -Werror" >> mk/build.mk
+echo "SRC_CC_OPTS += -Werror" >> mk/build.mk
 
 # You can override the default validate settings using mk/validate.mk
 # e.g. you could add GhcLibWays=p to test profiling.
@@ -25,13 +30,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
@@ -47,7 +48,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"