[commit: Cabal] master: Don't try to run test suites where none exist. (86fa122)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/86fa1223a96a3a054b1c02b6305f566440887f4e

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

commit 86fa1223a96a3a054b1c02b6305f566440887f4e
Author: Thomas Tuegel <ttuegel at gmail.com>
Date:   Thu Feb 16 18:46:17 2012 +0000

    Don't try to run test suites where none exist.

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

 cabal-install/Distribution/Client/Install.hs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index b16f0e6..68a1132 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -895,9 +895,10 @@ installUnpackedPackage verbosity scriptOptions miscOptions
 
   -- Tests phase
       onFailure TestsFailed $ do
-        when shouldTest $ setup Cabal.testCommand testFlags
+        when (testsEnabled && PackageDescription.hasTests pkg) $
+            setup Cabal.testCommand testFlags
 
-        let testsResult | shouldTest = TestsOk
+        let testsResult | testsEnabled = TestsOk
                         | otherwise = TestsNotTried
 
       -- Install phase
@@ -921,7 +922,7 @@ installUnpackedPackage verbosity scriptOptions miscOptions
     haddockFlags' _   = haddockFlags {
       haddockVerbosity = toFlag verbosity'
     }
-    shouldTest = fromFlag (configTests configFlags)
+    testsEnabled = fromFlag (configTests configFlags)
     testFlags _ = Cabal.emptyTestFlags
     installFlags _   = Cabal.emptyInstallFlags {
       Cabal.installDistPref  = configDistPref configFlags,