X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=3ca888fba149584b339f8d1618456a01a91e5c8a;hp=8d6e2c3043a9aac3233cc0ab4604c59ba493065e;hb=HEAD;hpb=6bb8d64a971afce310df3349e8767b790c2845ee diff --git a/validate b/validate old mode 100644 new mode 100755 index 8d6e2c3..3ca888f --- a/validate +++ b/validate @@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then INSTDIR=`cygpath -m "$INSTDIR"` fi - /usr/bin/perl -w boot --required-tag=dph + /usr/bin/perl -w boot --validate --required-tag=dph ./configure --prefix="$INSTDIR" $config_args fi @@ -86,6 +86,21 @@ $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 if [ "$hpc" = YES ]