Fix and supress some warnings, and turn on -Werror when validating

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index 8f70811..cb9b307 100644 (file)
--- a/validate
+++ b/validate
@@ -11,9 +11,11 @@ if [ -f mk/build.mk ]; then
 fi
 
 # The default is a "quick" build
-echo BuildFlavour=quick >  mk/build.mk
-echo HADDOCK_DOCS=YES   >> 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.
@@ -46,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"