Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/89cfcda09a36da39cefab61b0bc40a5df952fc21

>---------------------------------------------------------------

commit 89cfcda09a36da39cefab61b0bc40a5df952fc21
Author: Simon Marlow <[email protected]>
Date:   Tue May 24 13:43:04 2011 +0100

    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.

>---------------------------------------------------------------

 validate |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

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 ]



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to