[commit: packages/Cabal] ghc-head: Pass '--builddir' to 'test' when running 'install --enable-tests'. (cb2d836)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=cb2d836c2a2d543e50c2b3f77126e1e81d464f63

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

commit cb2d836c2a2d543e50c2b3f77126e1e81d464f63
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Wed May 29 15:55:12 2013 +0200

    Pass '--builddir' to 'test' when running 'install --enable-tests'.


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

cb2d836c2a2d543e50c2b3f77126e1e81d464f63
 cabal-install/Distribution/Client/Install.hs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 26d4924..c057bf3 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -102,7 +102,7 @@ import Distribution.Simple.Setup
          , buildCommand, BuildFlags(..), emptyBuildFlags
          , toFlag, fromFlag, fromFlagOrDefault, flagToMaybe )
 import qualified Distribution.Simple.Setup as Cabal
-         ( installCommand, InstallFlags(..), emptyInstallFlags
+         ( installCommand, InstallFlags(..), TestFlags(..), emptyInstallFlags
          , emptyTestFlags, testCommand, Flag(..) )
 import Distribution.Simple.Utils
          ( rawSystemExit, comparing, writeFileAtomic )
@@ -1206,7 +1206,9 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
       haddockVerbosity = toFlag verbosity'
     }
     testsEnabled = fromFlag (configTests configFlags)
-    testFlags _ = Cabal.emptyTestFlags
+    testFlags _ = Cabal.emptyTestFlags {
+      Cabal.testDistPref = configDistPref configFlags
+    }
     installFlags _   = Cabal.emptyInstallFlags {
       Cabal.installDistPref  = configDistPref configFlags,
       Cabal.installVerbosity = toFlag verbosity'