X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=876dabb66131da5220e94ace55a604e7a762c481;hp=42bb9b5720becb140dad69665b0a00a05e2eea7d;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hpb=83331f7e23838262be61e8ec2d78abcffd1a077e

diff --git a/validate b/validate
index 42bb9b5..876dabb 100644
--- a/validate
+++ b/validate
@@ -6,18 +6,6 @@ if [ -f mk/config.mk ]; then
    make distclean
 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
-
 case $OSTYPE in
   cygwin|msys) config_args=--build=i386-unknown-mingw32
                if [ -f c:/mingw/bin/gcc.exe ]; then
@@ -27,29 +15,25 @@ case $OSTYPE in
 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
+    threads=2
 else
-   threads=`expr $CPUS + 1`
+    threads=`expr $CPUS + 1`
 fi
 
 sh boot
 ./configure $config_args
 
-make -j$threads
+make Validating=YES -j$threads
 
 # ToDo: use THREADS=$threads, see #1558
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
+make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
 
 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"