X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=5d0afb4d2b4c191cb55669788aa5942660eebcde;hp=9ab5e0d9705d0b43c66eeefc7ea59e168028e128;hb=3710a4ef1ca665fe4ed705a6b0f4400d680c7b54;hpb=29d909009d47c52c5f02630658f7422c634230ab

diff --git a/validate b/validate
index 9ab5e0d..5d0afb4 100644
--- a/validate
+++ b/validate
@@ -1,31 +1,49 @@
 #!/bin/sh
 
-set -e
-
-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
+#   --hpc:            build stage2 with -fhpc, and see how much of the
+#                     compiler the test suite covers.
+#                     2008-07-01: 63% slower than the default.
+#                     HTML generated here: testsuite/hpc_output/hpc_index.html
+#   --fast:           Default. Opposite to --slow.
+#   --slow:           Build stage2 with -DDEBUG.
+#                     2008-07-01: 14% slower than the default.
 
-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
-echo HADDOCK_DOCS=YES   >> mk/build.mk
-cat mk/build.mk.sample  >> mk/build.mk
+set -e
 
-# 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
+no_clean=0
+testsuite_only=0
+hpc=NO
+slow=NO
 
-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
+while [ $# -gt 0 ]
+do
+    case "$1" in
+    --no-clean)
+        no_clean=1
+        ;;
+    --testsuite-only)
+        testsuite_only=1
+        ;;
+    --hpc)
+        hpc=YES
+        ;;
+    --slow)
+        slow=YES
+        ;;
+    --fast)
+        slow=NO
+        ;;
+    *)
+        echo "Bad argument: $1" >&2
+        exit 1;;
+    esac
+    shift
+done
 
 if [ "$CPUS" = "" ]; then
     threads=2
@@ -33,32 +51,88 @@ else
     threads=`expr $CPUS + 1`
 fi
 
-sh boot
-./configure $config_args
+if [ $testsuite_only -eq 0 ]; then
+
+if [ $no_clean -eq 0 ]; then
+    if [ -f mk/config.mk ]; then
+        make distclean
+    fi
+
+    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
+
+    sh boot
+    ./configure "--prefix=`pwd`/inst" $config_args
+fi
+
+thisdir=`utils/pwd/pwd forwardslash`
 
-make -j$threads
+echo "Validating=YES" > mk/are-validating.mk
 
-# ToDo: use THREADS=$threads, see #1558
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
+make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+fi # testsuite-only
 
+if [ "$hpc" = YES ]
+then
+    # XXX With threads we'd need to give a different tix file to each thread
+    #     and then sum them up at the end
+    threads=1
+    HPCTIXFILE=$thisdir/testsuite/hpc_output/ghc.tix
+    export HPCTIXFILE
+    rm -f $HPCTIXFILE
+fi
+
+make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+
+if [ "$hpc" = YES ]
+then
+    utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix
+fi
+
+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 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 "-------------------------------------------------------------------"
+    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
+        if grep -q "^[^#]" mk/validate.mk
+        then
+            cat <<EOF
+
+WARNING: You seem to have things set in mk/validate.mk. Please check
+that it is OK before pushing.
+EOF
+        fi
+    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 unexpected test results or"
-   echo "framework 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 "-------------------------------------------------------------------"
+