This goes with the patch for #1839, #1463

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index 1852358..876dabb 100644 (file)
--- a/validate
+++ b/validate
@@ -6,18 +6,6 @@ if [ -f mk/config.mk ]; then
    make distclean
 fi
 
    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
 case $OSTYPE in
   cygwin|msys) config_args=--build=i386-unknown-mingw32
                if [ -f c:/mingw/bin/gcc.exe ]; then

@@ -35,17 +23,17 @@ fi
 sh boot
 ./configure $config_args
 
 sh boot
 ./configure $config_args
 

-make -j$threads
+make Validating=YES -j$threads

 
 # ToDo: use THREADS=$threads, see #1558
 
 # 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 "-------------------------------------------------------------------"
 
 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"
    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"