X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=3ca888fba149584b339f8d1618456a01a91e5c8a;hp=01d6a829e604270d697028b3be8bcaf07f3d83f4;hb=HEAD;hpb=15f7bc388dc47147bfcbb07f43afb70788369d4e

diff --git a/validate b/validate
old mode 100644
new mode 100755
index 01d6a82..3ca888f
--- a/validate
+++ b/validate
@@ -55,10 +55,17 @@ else
     threads="$THREADS"
 fi
 
+if type gmake > /dev/null 2> /dev/null
+then
+    make="gmake"
+else
+    make="make"
+fi
+
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    make maintainer-clean NO_CLEAN_GMP=YES
+    $make maintainer-clean NO_CLEAN_GMP=YES
 
     INSTDIR=`pwd`/inst
     if [ "$OSTYPE" = "cygwin" ]
@@ -66,18 +73,33 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    sh boot
+    /usr/bin/perl -w boot --validate --required-tag=dph
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
-thisdir=`utils/ghc-pwd/ghc-pwd`
+thisdir=`utils/ghc-pwd/dist-boot/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
+$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
 
 fi # testsuite-only
 
@@ -91,7 +113,14 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES 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