[commit: Cabal] master: Do not include disabled tests into the component build graph (6ea773a)

[Duncan Coutts]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6ea773a75491f5d8266320256a38aae583f7d387

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

commit 6ea773a75491f5d8266320256a38aae583f7d387
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Sun May 8 19:09:44 2011 +0000

    Do not include disabled tests into the component build graph

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

 Distribution/PackageDescription.hs |    1 +
 Distribution/Simple/Configure.hs   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Distribution/PackageDescription.hs b/Distribution/PackageDescription.hs
index d39f7e1..097b292 100644
--- a/Distribution/PackageDescription.hs
+++ b/Distribution/PackageDescription.hs
@@ -642,6 +642,7 @@ allComponentsBy pkg_descr f = [ f (CLib l) | Just l <- [library pkg_descr]
                               ++
                               [ f (CTst t) | t <- testSuites pkg_descr
                                            , buildable (testBuildInfo t)
+                                           , testEnabled t
                               ]
 
 -- | The 'Language's used by this component
diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
index c788235..401f724 100644
--- a/Distribution/Simple/Configure.hs
+++ b/Distribution/Simple/Configure.hs
@@ -521,7 +521,7 @@ configure (pkg_descr0, pbi) cfg
                                             (configScratchDir cfg),
                     libraryConfig       = configLib `fmap` library pkg_descr',
                     executableConfigs   = configExe `fmap` executables pkg_descr',
-                    testSuiteConfigs    = configTest `fmap` filter testEnabled (testSuites pkg_descr'),
+                    testSuiteConfigs    = configTest `fmap` testSuites pkg_descr',
                     compBuildOrder      = buildOrder,
                     installedPkgs       = packageDependsIndex,
                     pkgDescrFile        = Nothing,