From: Simon Marlow Date: Tue, 24 May 2011 12:43:04 +0000 (+0100) Subject: Install the mtl package into the bindist when validating. This allows X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=89cfcda09a36da39cefab61b0bc40a5df952fc21 Install the mtl package into the bindist when validating. This allows some more tests to run (those with reqlib('mtl')) and serves as an extra sanity check on Cabal and the bindist. --- diff --git a/validate b/validate index b1ae14f..3ca888f 100755 --- a/validate +++ b/validate @@ -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 ]