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

diff --git a/validate b/validate
index 6ba8901..7949d62 100644
--- a/validate
+++ b/validate
@@ -16,15 +16,36 @@ cat mk/build.mk.sample >>mk/build.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
+   # ToDo: make -j doesn't work in libraries/ on Windows (see #1559)
+   case $OSTYPE in
+       cygwin|msys) threads=1;;
+       *)           threads=2;;
+   esac
+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
@@ -37,7 +58,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