Ticket #847: cabal-1.10-allow-multiple-test-options.dpatch

1 patch for repository /home/ttuegel/repos/cabal-1.10:

Mon May 23 12:54:45 CDT 2011  Thomas Tuegel <ttuegel@gmail.com>
  * Allow multiple test options (backported to Cabal-1.10)

New patches:

[Allow multiple test options (backported to Cabal-1.10)
Thomas Tuegel <ttuegel@gmail.com>**20110523175445
 Ignore-this: 2dd2899dfcb36d0cfedaf8a327f3ace1
] {
hunk ./Distribution/Simple/Setup.hs 1240
     --TODO: eliminate the test list and pass it directly as positional args to the testHook
     testList :: Flag [String],
     -- TODO: think about if/how options are passed to test exes
-    testOptions :: Flag [PathTemplate]
+    testOptions :: [PathTemplate]
   }
 
 defaultTestFlags :: TestFlags
hunk ./Distribution/Simple/Setup.hs 1251
     testMachineLog = toFlag $ toPathTemplate $ "$pkgid.log",
     testShowDetails = toFlag Failures,
     testList = Flag [],
-    testOptions = Flag []
+    testOptions = []
   }
 
 testCommand :: CommandUI TestFlags
hunk ./Distribution/Simple/Setup.hs 1295
              ++ "(name templates can use $pkgid, $compiler, "
              ++ "$os, $arch, $test-suite)")
             testOptions (\v flags -> flags { testOptions = v })
-            (reqArg' "TEMPLATES" (toFlag . map toPathTemplate . splitArgs)
-                (map fromPathTemplate . fromFlagOrDefault []))
+            (reqArg' "TEMPLATES" (map toPathTemplate . splitArgs) (const []))
       , option [] ["test-option"]
             ("give extra option to test executables "
              ++ "(no need to quote options containing spaces, "
hunk ./Distribution/Simple/Setup.hs 1302
              ++ "name template can use $pkgid, $compiler, "
              ++ "$os, $arch, $test-suite)")
             testOptions (\v flags -> flags { testOptions = v })
-            (reqArg' "TEMPLATE" (\x -> toFlag [toPathTemplate x])
-                (map fromPathTemplate . fromFlagOrDefault []))
+            (reqArg' "TEMPLATE" (\x -> [toPathTemplate x])
+                (map fromPathTemplate))
       ]
 
 emptyTestFlags :: TestFlags
hunk ./Distribution/Simple/Test.hs 169
     let distPref = fromFlag $ testDistPref flags
         verbosity = fromFlag $ testVerbosity flags
         testLogDir = distPref </> "test"
-        optionTemplates = fromFlag $ testOptions flags
-        options = map (testOption pkg_descr lbi suite) optionTemplates
+        options = map (testOption pkg_descr lbi suite) $ testOptions flags
 
     pwd <- getCurrentDirectory
     existingEnv <- getEnvironment
}

Context:

[Refactor to avoid problems when $HOME is not set
Ian Lynagh <igloo@earth.li>**20110417154135
 Ignore-this: 75c06dea58512d01c9d28e7de4881222
 We now avoid calling getWindowsProgramFilesDir and
 getAppUserDataDirectory when we don't need to know their results.
 This means that a GHC build goes through when $HOME is unset
 (GHC trac #5047).
] 
[Remove log files before running tests by default.
Thomas Tuegel <ttuegel@gmail.com>**20110303041840
 Ignore-this: 9007c1adc908897843ea29591decea3c
] 
[Including test suites in product of 'setup sdist'.
Thomas Tuegel <ttuegel@gmail.com>**20110119153404
 Ignore-this: a7fcc71333e13c763547561aced2375c
 See ticket #792.
] 
[Fix to build with ghc-6.6 and 6.8
Duncan Coutts <duncan@community.haskell.org>**20110311140038
 Ignore-this: 6a20e732968b7655402a922880562b6c
] 
[Fix for test suite stanza with conditionals.
Thomas Tuegel <ttuegel@gmail.com>**20110418134745
 Ignore-this: 9cbfa7d384d7e0d640e905946c1c36cb
 Ticket #811. This fixes a problem where Cabal would fail to detect the "type"
 field of a test suite when the test suite contained a conditional.
 Conditionals can now be used, with the restriction that the "type" field and
 the appropriate "main-is" or "test-module" field must be specified together
 in any conditional branch where they occur.
] 
[Update release script for recent haskell.org server changes
Duncan Coutts <duncan@community.haskell.org>**20110227171445
 Ignore-this: 3243990fca0f6e619dbaca47615bd009
] 
[Fix release date in changelog
Duncan Coutts <duncan@community.haskell.org>**20110227150619
 Ignore-this: 2cc2858ea00e5005364f369178a944e3
] 
[TAG 1.10.1.0
Duncan Coutts <duncan@community.haskell.org>**20110227171356
 Ignore-this: f3491cd8e122c859a166d5c85296bdee
] 
Patch bundle hash:
3b6e3369a5d8d97367e7684658f78dd49d126c02