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

diff --git a/validate b/validate
index 6ba8901..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,24 +11,44 @@ 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.
 echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
 
+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
+               ;;
+esac
+
+if [ "$CPUS" = "" ]; then
+    threads=2
+else
+    threads=`expr $CPUS + 1`
+fi
+
 sh boot
-./configure
-# ToDo: configure args
+./configure $config_args
 
-make -j2
+make -j$threads
 
+# ToDo: use THREADS=$threads, see #1558
 make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
 
-if grep '0 unexpected failures' testlog >/dev/null 2>/dev/null; then
+if
+    grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null &&
+    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"
@@ -37,7 +59,8 @@ if grep '0 unexpected failures' testlog >/dev/null 2>/dev/null; then
    echo "-------------------------------------------------------------------"
 else
    echo "-------------------------------------------------------------------"
-   echo "Oops!  Looks like you have some test failures."
+   echo "Oops!  Looks like you have some unexpected test results or"
+   echo "framework failures."
    echo "Please fix them before pushing/sending patches."
    echo "-------------------------------------------------------------------"
 fi