Minor Revision

src/CommandLine.hs

@@ -1,7 +1,8 @@
 module CommandLine (
     optDescrs, cmdLineArgsMap, cmdFlavour, lookupFreeze1, cmdIntegerSimple,
     cmdProgressColour, cmdProgressInfo, cmdConfigure, cmdSplitObjects,
-    cmdInstallDestDir, lookupBuildRoot, TestArgs(..), defaultTestArgs
+    cmdInstallDestDir, lookupBuildRoot, TestArgs(..), TestSpeed(..), 
+    defaultTestArgs
     ) where
 
 import Data.Either
@@ -12,6 +13,8 @@ import Hadrian.Utilities hiding (buildRoot)
 import System.Console.GetOpt
 import System.Environment
 
+data TestSpeed = Slow | Average | Fast deriving (Show, Eq)
+
 -- | All arguments that can be passed to Hadrian via the command line.
 data CommandLineArgs = CommandLineArgs
     { configure      :: Bool
@@ -161,8 +164,8 @@ readTestThreads thread = Right $ \flags -> flags { testArgs = (testArgs flags) {
 readTestVerbose :: Maybe String -> Either String (CommandLineArgs -> CommandLineArgs)
 readTestVerbose verbose = Right $ \flags -> flags { testArgs = (testArgs flags) { testVerbosity = verbose } }
 
-readTestWays :: Maybe String -> Either String (CommandLineArgs -> CommandLineArgs)
-readTestWays ways = 
+readTestWay :: Maybe String -> Either String (CommandLineArgs -> CommandLineArgs)
+readTestWay ways = 
     case ways of
         Nothing -> Right id
         Just way -> Right $ \flags -> 
@@ -208,7 +211,7 @@ optDescrs =
       "Number of concurrent parallel jobs"
     , Option [] ["test-verbose"] (OptArg readTestVerbose "TEST_VERBOSE")
       "A verbosity value between 0 and 5. 0 is silent, 4 and higher activates extra output."
-    , Option [] ["test-way"] (OptArg readTestWays "TEST_WAY")
+    , Option [] ["test-way"] (OptArg readTestWay "TEST_WAY")
       "only run these ways" ]
 
 -- | A type-indexed map containing Hadrian command line arguments to be passed

src/Hadrian/Utilities.hs

@@ -31,9 +31,6 @@ module Hadrian.Utilities (
 
     -- * Useful re-exports
     Dynamic, fromDynamic, toDyn, TypeRep, typeOf,
-
-    -- * Testsuite Settings
-    TestSpeed (..)
     ) where
 
 import Control.Monad.Extra
@@ -484,6 +481,3 @@ renderUnicorn ls =
     ponyPadding = "                                            "
     boxLines :: [String]
     boxLines = ["", "", ""] ++ (lines . renderBox $ ls)
-
-data TestSpeed = Slow | Average | Fast deriving (Show, Eq)
-

src/Rules/Test.hs

@@ -71,8 +71,7 @@ needTestsuiteBuilders = do
     need targets
   where
     needfile :: Stage -> Package -> Action FilePath
-    needfile stage pkg | isLibrary pkg = pkgConfFile (Context stage pkg vanilla)
-                       | otherwise     = programPath =<< programContext stage pkg
+    needfile stage pkg = programPath =<< programContext stage pkg
 
 
 needTestBuilders :: Action ()

src/Settings/Builders/Make.hs

@@ -25,7 +25,7 @@ validateBuilderArgs = builder (Make "testsuite/tests") ? do
     checkPpr            <- expr $ fullpath checkPpr
     checkApiAnnotations <- expr $ fullpath checkApiAnnotations
     return [ "fast"
-           , "THREADS=" ++ threads
+           , "THREADS=" ++ show threads
            , "TEST_HC=" ++ (top -/- compiler)
            , "CHECK_PPR=" ++ (top -/- checkPpr)
            , "CHECK_API_ANNOTATIONS=" ++ (top -/- checkApiAnnotations)

src/Settings/Builders/RunTest.hs

@@ -1,6 +1,6 @@
 module Settings.Builders.RunTest (runTestBuilderArgs) where
 
-import CommandLine (TestArgs(..), defaultTestArgs)
+import CommandLine (TestArgs(..), defaultTestArgs, TestSpeed(..))
 import Flavour
 import GHC.Packages
 import Hadrian.Builder (getBuilderPath)