X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=8f0f5438933a12d42d6f4ddd701b85ad26e119dd;hp=6ba8901a8274d1951ebf66a7b05b428211bd0543;hb=842e9d6628a27cf1f420d53f6a5901935dc50c54;hpb=e1c1b8bcbeb8750da1ab88a3b0b841e5a39110bc

diff --git a/validate b/validate
index 6ba8901..8f0f543 100644
--- a/validate
+++ b/validate
@@ -1,43 +1,92 @@
-#!/bin/sh -e
+#!/bin/sh
 
-if [ -f mk/config.mk ]; then
-   make distclean
-fi
+# Flags:
+#   --no-clean:       don't make clean first, just carry on from
+#                     a previous interrupted validation run
+#   --testsuite-only: don't build the compiler, just run
+#                     the test suite
+
+set -e
+
+no_clean=0
+testsuite_only=0
+
+while [ $# -gt 0 ]
+do
+    case "$1" in
+    --no-clean)
+        no_clean=1
+        ;;
+    --testsuite-only)
+        testsuite_only=1
+        ;;
+    *)
+        echo "Bad argument: $1" >&2
+        exit 1;;
+    esac
+    shift
+done
 
-if [ -f mk/build.mk ]; then
-   mv mk/build.mk mk/build.mk.bak
+if [ $testsuite_only -eq 0 ]; then
+
+if [ $no_clean -eq 0 ] && [ -f mk/config.mk ]; then
+    make distclean
 fi
 
-# The default is a "quick" build
-echo BuildFlavour=quick >mk/build.mk
-cat mk/build.mk.sample >>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
 
-# 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
+if [ "$CPUS" = "" ]; then
+    threads=2
+else
+    threads=`expr $CPUS + 1`
+fi
 
 sh boot
-./configure
-# ToDo: configure args
-
-make -j2
-
-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
-   echo "-------------------------------------------------------------------"
-   echo "Congratulations!  This tree is 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 "as necessary."
-   echo
-   echo "When you are satisfied that you haven't broken anything, go ahead"
-   echo "and push/send your patches".
-   echo "-------------------------------------------------------------------"
+./configure "--prefix=`pwd`/inst" $config_args
+
+make Validating=YES -j$threads
+fi # testsuite-only
+
+# ToDo: use THREADS=$threads, see #1558
+make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
+
+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
+    if [ $testsuite_only -eq 0 ] && [ $no_clean -eq 0 ]
+    then
+        cat <<EOF
+Congratulations!  This tree has passed minimal testing.
+
+NOTE: If you have made changes that may cause failures not tested for by
+the minimal testing procedure, please do further testing as necessary.
+
+When you are satisfied that you haven't broken anything, go ahead and
+push/send your patches.
+EOF
+    else
+        cat <<EOF
+I didn't find any problems, but this wasn't a complete validate run,
+so be careful!
+
+NOTE: If you have made changes that may cause failures not tested for by
+the minimal testing procedure, please do further testing as necessary.
+EOF
+   fi
 else
-   echo "-------------------------------------------------------------------"
-   echo "Oops!  Looks like you have some test failures."
-   echo "Please fix them before pushing/sending patches."
-   echo "-------------------------------------------------------------------"
+    cat <<EOF
+Oops!  Looks like you have some unexpected test results or framework failures.
+Please fix them before pushing/sending patches.
+EOF
 fi
+echo "-------------------------------------------------------------------"
+