fixed tests cases to match ross changes

Distribution/PackageDescription.hs

@@ -598,6 +598,7 @@ testPkgDesc = unlines [
         "Name: Cabal",
         "Version: 0.1.1.1.1-rain",
         "License: LGPL",
+        "License-File: foo",
         "Copyright: Free Text String",
         "-- Optional - may be in source?",
         "Author: Happy Haskell Hacker",
@@ -639,6 +640,7 @@ testPkgDescAnswer =
                                                  pkgVersion = Version {versionBranch = [0,1,1,1,1],
                                                  versionTags = ["rain"]}},
                     license = LGPL,
+                    licenseFile = "foo",
                     copyright = "Free Text String",
                     author  = "Happy Haskell Hacker",
                     homepage = "http://www.haskell.org/foo",

Distribution/Simple.hs

@@ -81,16 +81,13 @@ import Distribution.Simple.Install(install)
 import Distribution.Simple.Utils (die, currentDir, rawSystemVerbose,
                                   defaultPackageDesc, defaultHookedPackageDesc,
                                   moduleToFilePath)
-import Distribution.License
-import Distribution.Extension
-import Distribution.Version
-
 -- Base
 import System.Cmd	(rawSystem)
 import System.Environment(getArgs)
 import System.Exit(ExitCode(..), exitWith)
 import System.Directory(removeFile, doesFileExist)
 
+import Distribution.License
 import Control.Monad(when, unless)
 import Data.List	( intersperse )
 import Data.Maybe       ( isNothing, fromJust, maybeToList )
@@ -103,8 +100,14 @@ import Distribution.Compat.FilePath(joinFileName, joinPaths, splitFileName, join
 
 #ifdef DEBUG
 import HUnit (Test)
+import Distribution.Extension hiding (hunitTests)
+import Distribution.Version hiding (hunitTests)
+#else
+import Distribution.Extension
+import Distribution.Version
 #endif
 
+
 type Args = [String]
 
 -- | Hooks allow authors to add specific functionality before and after

test/A/A.cabal

 Name: test
 Version: 1.0
-Hidden-Modules: B.A
+Other-Modules: B.A
 Exposed-Modules: A
 C-Sources: hello.c, c_src/hello.c
 Extensions: ForeignFunctionInterface
 
 Executable: testA
-Hidden-Modules: A, MainA
+Other-Modules: A, MainA
 Main-is: MainA.hs
 Extensions: OverlappingInstances
 
 Executable: testB
-Hidden-Modules: B.A, B.MainB
+Other-Modules: B.A, B.MainB
 Main-is: B/MainB.hs

test/HUnit-1.0/HUnit.cabal

@@ -2,6 +2,6 @@ Name: HUnit
 Version: 1.0
 License: AllRightsReserved
 Build-Depends: haskell-src
-Hidden-Modules: HUnitText, HUnitLang, HUnitTestBase, Terminal, HUnitBase
+Other-Modules: HUnitText, HUnitLang, HUnitTestBase, Terminal, HUnitBase
 Exposed-Modules: HUnit
 HS-Source-Dir: src

test/depOnLib/test.cabal

@@ -4,6 +4,6 @@ hs-source-dir: libs
 exposed-modules: A
 
 Executable: mainForA
-Hidden-Modules: Main, A
+Other-Modules: Main, A
 hs-source-dir: mains
 Main-is: Main.hs

test/twoMains/test.cabal

@@ -2,9 +2,9 @@ Name: test
 Version: 1.0
 
 Executable: testA
-Hidden-Modules: MainA
+Other-Modules: MainA
 Main-is: MainA.hs
 
 Executable: testB
-Hidden-Modules: MainB
+Other-Modules: MainB
 Main-is: MainB.hs

test/wash2hs/wash2hs.cabal

@@ -5,7 +5,7 @@ Build-Depends: text
 
 executable: wash2hs
 hs-source-dir: hs
-hidden-Modules: WASHClean,  WASHExpression,  WASHGenerator,  WASHOut,
+Other-Modules: WASHClean,  WASHExpression,  WASHGenerator,  WASHOut,
                 WASHData,   WASHFlags,       WASHMain,       WASHParser,
                 WASHUtil
 main-is: WASHMain.hs

test/withHooks/Setup.lhs

@@ -36,6 +36,7 @@
 > main :: IO ()
 > main = defaultMainWithHooks defaultUserHooks
 >        {preConf=myPreConf,
+>         postConf=(\_ _ _-> return ExitSuccess),
 >         hookedPreProcessors=  [("testSuffix", \ _ _ -> ppTestHandler)],
->         postClean=(\_ _ -> removeFile "Setup.buildinfo" >> return ExitSuccess)
+>         postClean=(\_ _ _ -> removeFile "Setup.buildinfo" >> return ExitSuccess)
 >        }

test/withHooks/withHooks.cabal

@@ -3,5 +3,5 @@ Version: 1.0
 exposed-modules: Main, C
 
 Executable: withHooks
-Hidden-Modules: Main
+Other-Modules: Main
 Main-is: Main.hs