X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=39fa819cd13dac705f9f4f4aaecdb940812b5408;hb=31cf07bc6d4aa5babc48498c6c4198b642f50390;hp=73bef5292dd7c4222525bb3868c4b6791f5a11f7;hpb=8ce457c49024a92dc0e13c0d36cc6753edec8087;p=ghc-hetmet.git

diff --git a/validate b/validate
index 73bef52..39fa819 100644
--- a/validate
+++ b/validate
@@ -7,18 +7,27 @@ fi
 if [ -f mk/build.mk ]; then
    mv mk/build.mk mk/build.mk.bak
 fi
+
+# The default is a "quick" build
 echo BuildFlavour=quick >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.
+echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
+
 sh boot
 ./configure
 # ToDo: configure args
 
 make -j2
 
-make -C testsuite/tests/ghc-regress fast stage=2 2>&1 | tee testlog
+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
@@ -31,7 +40,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