[commit: Cabal] master: Filter out unbuildable test-suites (f7a382d)

[Duncan Coutts]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f7a382d94f4a2de2e20a429a88627220a6b0074f

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

commit f7a382d94f4a2de2e20a429a88627220a6b0074f
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Mon May 16 15:38:01 2011 +0000

    Filter out unbuildable test-suites

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

 Distribution/Simple/Test.hs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Distribution/Simple/Test.hs b/Distribution/Simple/Test.hs
index 3fa3296..9ee670b 100644
--- a/Distribution/Simple/Test.hs
+++ b/Distribution/Simple/Test.hs
@@ -57,7 +57,8 @@ import Distribution.ModuleName ( ModuleName )
 import Distribution.Package
     ( PackageId )
 import qualified Distribution.PackageDescription as PD
-         ( PackageDescription(..), TestSuite(..)
+         ( PackageDescription(..), BuildInfo(buildable)
+         , TestSuite(..)
          , TestSuiteInterface(..), testType, hasTests )
 import Distribution.Simple.Build.PathsModule ( pkgPathEnvVar )
 import Distribution.Simple.BuildPaths ( exeExtension )
@@ -257,7 +258,9 @@ test pkg_descr lbi flags = do
         testLogDir = distPref </> "test"
         testNames = fromFlag $ testList flags
         pkgTests = PD.testSuites pkg_descr
-        enabledTests = filter PD.testEnabled pkgTests
+        enabledTests = [ t | t <- pkgTests
+                           , PD.testEnabled t
+                           , PD.buildable (PD.testBuildInfo t) ]
 
         doTest :: (PD.TestSuite, Maybe TestSuiteLog) -> IO TestSuiteLog
         doTest (suite, mLog) = do