X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=3ca888fba149584b339f8d1618456a01a91e5c8a;hp=d6f6adb096959c29a0fa6dbe4257805d8a8c2085;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=982f6e5405eadb41860772ad0fe13ce0980fad2f

diff --git a/validate b/validate
old mode 100644
new mode 100755
index d6f6adb..3ca888f
--- a/validate
+++ b/validate
@@ -8,6 +8,7 @@
 #   --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.
@@ -44,33 +45,62 @@ do
     shift
 done
 
-if [ $testsuite_only -eq 0 ]; then
+if [ "$THREADS" = "" ]; then
+    if [ "$CPUS" = "" ]; then
+        threads=2
+    else
+        threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    fi
+else
+    threads="$THREADS"
+fi
 
-if [ $no_clean -eq 0 ] && [ -f mk/config.mk ]; then
-    make distclean
+if type gmake > /dev/null 2> /dev/null
+then
+    make="gmake"
+else
+    make="make"
 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 [ $testsuite_only -eq 0 ]; then
 
-if [ "$CPUS" = "" ]; then
-    threads=2
-else
-    threads=`expr $CPUS + 1`
+if [ $no_clean -eq 0 ]; then
+    $make maintainer-clean NO_CLEAN_GMP=YES
+
+    INSTDIR=`pwd`/inst
+    if [ "$OSTYPE" = "cygwin" ]
+    then
+        INSTDIR=`cygpath -m "$INSTDIR"`
+    fi
+
+    /usr/bin/perl -w boot --validate --required-tag=dph
+    ./configure --prefix="$INSTDIR" $config_args
 fi
 
-sh boot
-./configure "--prefix=`pwd`/inst" $config_args
+thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
 
-thisdir=`utils/pwd/pwd forwardslash`
+echo "Validating=YES" > mk/are-validating.mk
+
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
+
+#
+# Install the mtl package into the bindist, because it is used by some
+# tests.  It isn't essential that we do this (the failing tests will
+# be treated as expected failures), but we get a bit more test
+# coverage, and also verify that we can install a package into the
+# bindist with Cabal.
+#
+bindistdir="bindisttest/install dir"
+cd libraries/mtl
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs configure --with-ghc="$thisdir/$bindistdir/bin/ghc" --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs build  --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs install  --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs clean  --builddir=dist-bindist
+cd $thisdir
 
-make Validating=YES -j$threads ValidateHpc=$hpc ValidateSlow=$slow
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -83,7 +113,14 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
+
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then
@@ -106,6 +143,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,
@@ -113,13 +161,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 "-------------------------------------------------------------------"