Tweak the alternative layout rule: {} contains commas

[ghc-hetmet.git] / validate

diff --git a/validate b/validate
index 866ab09..741daac 100644 (file)
--- a/validate
+++ b/validate
@@ -6,13 +6,19 @@
 #   --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
+#                     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.
 
 set -e
 
 no_clean=0
 testsuite_only=0
-hpc=0
+hpc=NO
+slow=NO
 
 while [ $# -gt 0 ]
 do
@@ -24,7 +30,13 @@ do
         testsuite_only=1
         ;;
     --hpc)
-        hpc=1
+        hpc=YES
+        ;;
+    --slow)
+        slow=YES
+        ;;
+    --fast)
+        slow=NO
         ;;
     *)
         echo "Bad argument: $1" >&2
@@ -33,41 +45,39 @@ do
     shift
 done
 
-if [ $testsuite_only -eq 0 ]; then
-
-if [ $no_clean -eq 0 ] && [ -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
-
 if [ "$CPUS" = "" ]; then
     threads=2
 else
-    threads=`expr $CPUS + 1`
+    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
 fi
 
-sh boot
-./configure "--prefix=`pwd`/inst" $config_args
+if [ $testsuite_only -eq 0 ]; then
 
-thisdir=`utils/pwd/pwd forwardslash`
+if [ $no_clean -eq 0 ]; then
+    make maintainer-clean NO_CLEAN_GMP=YES
 
-if [ "$hpc" = 1 ]
-then
-    hpcflags="ValidateHpcFlags=-fhpc -hpcdir $thisdir/testsuite/hpc_output/"
+    INSTDIR=`pwd`/inst
+    if [ "$OSTYPE" = "cygwin" ]
+    then
+        INSTDIR=`cygpath -m "$INSTDIR"`
+    fi
+
+    sh boot
+    ./configure --prefix="$INSTDIR" $config_args
 fi
 
-make Validating=YES -j$threads ${hpcflags+"$hpcflags"}
+thisdir=`utils/ghc-pwd/ghc-pwd`
+
+echo "Validating=YES" > mk/are-validating.mk
+
+make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make -C bindisttest TEST_PREP=YES
+
 fi # testsuite-only
 
-if [ "$hpc" = 1 ]
+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
@@ -77,9 +87,9 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
-if [ "$hpc" = 1 ]
+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
@@ -100,6 +110,17 @@ 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
+        cat <<EOF
+-------------------------------------------------------------------
+EOF
     else
         cat <<EOF
 I didn't find any problems, but this wasn't a complete validate run,
@@ -107,13 +128,15 @@ 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
     cat <<EOF
 Oops!  Looks like you have some unexpected test results or framework failures.
 Please fix them before pushing/sending patches.
+-------------------------------------------------------------------
 EOF
+    exit 1
 fi
-echo "-------------------------------------------------------------------"