This goes with the patch for #1839, #1463

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index 73bef52..876dabb 100644 (file)
--- a/validate
+++ b/validate
@@ -1,26 +1,39 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ -f mk/config.mk ]; then
    make distclean
 fi
 
-if [ -f mk/build.mk ]; then
-   mv mk/build.mk mk/build.mk.bak
+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
-echo BuildFlavour=quick >mk/build.mk
-cat mk/build.mk.sample >>mk/build.mk
 
 sh boot
-./configure
-# ToDo: configure args
+./configure $config_args
 
-make -j2
+make Validating=YES -j$threads
 
-make -C testsuite/tests/ghc-regress fast stage=2 2>&1 | tee testlog
+# ToDo: use THREADS=$threads, see #1558
+make Validating=YES -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"
@@ -31,7 +44,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