Properly fix tests.

Distribution/PackageDescription.hs

@@ -1309,8 +1309,11 @@ testPkgDescAnswer =
                         options = [(GHC,[]),(Hugs,[]),(NHC,[]),(JHC,[])]
                       })]
   }
-
+-- #ifdef DEBUG
+-}
 hunitTests :: [Test]
+hunitTests = []
+{-
 hunitTests = [
               TestLabel "license parsers" $ TestCase $
                  sequence_ [assertParseOk ("license " ++ show lVal) lVal
@@ -1414,10 +1417,10 @@ assertParseOk mes expected actual
            (case actual of
              ParseOk _ v -> v == expected
              _         -> False)
-
+-}
 test :: IO Counts
 test = runTestTT (TestList hunitTests)
-
+{-
 ------------------------------------------------------------------------------
 
 test_stanzas' = readFields testFile >>= parseDescription'

tests/ModuleTest.hs

@@ -69,7 +69,7 @@ import qualified Distribution.Simple.GHCPackageConfig
     as GHC (localPackageConfig, maybeCreateLocalPackageConfig)
 
 import Distribution.Simple.Configure (configCompiler)
-
+import Distribution.Verbosity ( silent )
 -- base
 import Data.List (intersperse)
 import Control.Monad(when)
@@ -484,7 +484,7 @@ main = do putStrLn "compile successful"
               compilers = [GHC] --, Hugs]
           globalTests <-
             flip mapM compilers $ \compilerFlavour -> do
-              compiler <- configCompiler (Just compilerFlavour) Nothing Nothing 0
+              compiler <- configCompiler (Just compilerFlavour) Nothing Nothing silent
               let version = compilerVersion compiler
               runTestTT' $ TestList (testList compilerFlavour version)
           putStrLn "-------------"