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

2 patches for repository /home/ttuegel/repos/cabal-head:

Sat May 21 17:30:29 CDT 2011  Thomas Tuegel <ttuegel@gmail.com>
  * Fix use of multiple test options.

Sat May 21 18:20:47 CDT 2011  Thomas Tuegel <ttuegel@gmail.com>
  * Stop cabal-install from duplicating test options.

New patches:

[Fix use of multiple test options.
Thomas Tuegel <ttuegel@gmail.com>**20110521223029
 Ignore-this: c694ad21faab23abb7157ccec700ccf2
] {
hunk ./Distribution/Simple/Setup.hs 1268
     --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 1280
     testShowDetails = toFlag Failures,
     testKeepTix = toFlag False,
     testList = Flag [],
-    testOptions = Flag []
+    testOptions = []
   }
 
 testCommand :: CommandUI TestFlags
hunk ./Distribution/Simple/Setup.hs 1328
              ++ "(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)
+                (map fromPathTemplate))
       , option [] ["test-option"]
             ("give extra option to test executables "
              ++ "(no need to quote options containing spaces, "
hunk ./Distribution/Simple/Setup.hs 1336
              ++ "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 171
     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
}
[Stop cabal-install from duplicating test options.
Thomas Tuegel <ttuegel@gmail.com>**20110521232047
 Ignore-this: 55b98ab47306178e355cacedc7a5a6d2
] hunk ./Distribution/Simple/Setup.hs 1329
              ++ "$os, $arch, $test-suite)")
             testOptions (\v flags -> flags { testOptions = v })
             (reqArg' "TEMPLATES" (map toPathTemplate . splitArgs)
-                (map fromPathTemplate))
+                (const []))
       , option [] ["test-option"]
             ("give extra option to test executables "
              ++ "(no need to quote options containing spaces, "

Context:

[Filter out unbuildable test-suites
Duncan Coutts <duncan@community.haskell.org>**20110516153801
 Ignore-this: 44b647440f1d175569f24fb39141f3a5
] 
[Reimplement createDirectoryIfMissingVerbose to use sensible file permissions
Duncan Coutts <duncan@community.haskell.org>**20110517112344
 Ignore-this: c7262f6697bd31c92d2172372c2ea979
 Hopefully should fix ghc ticket #4982.
 The problem was permissions on directories: previously we used ordinary
 createDirectory and on unix this creates dirs using the current user's
 umask. If the root user has a silly umask then someone doing sudo
 install will end up with dirs that are not readable by non-root users.
 
 So the solution is to do the same as we do with files: override the
 umask and explicitly set the file permissions based on the kind of
 file: ordinary file, executable file and now also directory.
 
 Sadly we also had to re-implement createDirectoryIfMissing to use our
 new createDirectory wrapper function.
] 
[Do not include disabled tests into the component build graph
Duncan Coutts <duncan@community.haskell.org>**20110508190944
 Ignore-this: 62e75ea8babed6a70aca5c4e35ac53c4
] 
[intrapackage-deps-and-per-component-preprocessing
intractable@gmail.com**20110505014144
 Ignore-this: 5edd88b6d7abd19029186b8e006519ba
 This patch adds intrapackage dependency resolution so that components
 (libraries, exes, test suites) are build in the correct order.  This mean it's
 now possible to have, e.g., executables that depend on other executables defined
 in the same package description: the build-tools namespace has been extended
 accordingly.
   
 Related to this change is the refactoring of the do-it-all preprocessSources
 function, formerly invoked by initialBuildSteps, into a a function
 preprocessComponent that is invoked when a component is being built.  This lets
 us use executables defined in a package to be used as a custom preprocessor when
 building other components.
   
 Finally, a number of functions now operate on values of the sum type
 PackageDescription.Component rather than specifically operating on Library or
 Executable and so forth.
] 
[build-tools-extend-namespace
intractable@gmail.com**20091006055831
 Ignore-this: 22d38652ae859d4273475bc9c94ca79f
] 
[Implement Setup sdist --output-directory=dir
Duncan Coutts <duncan@community.haskell.org>**20110415040414
 Ignore-this: 6a5737b96341ed99384898b853f00525
 That is, allow generating a dir tree rather than a tarball.
 Apart from being useful directly, this is the right approach for
 tools like cabal-install. cabal-install does the tar step itself
 and might like to do other things like zip format.
 Also cleaned up the sdist code a little.
] 
[Add a type signature for getPrefixDirRel on Windows
Ian Lynagh <igloo@earth.li>**20110427145835
 Ignore-this: dbbc9f9cca1d28a657afff0f22b73cba
] 
[Fix the GHC HEAD build: Don't use deprecated catch function
Ian Lynagh <igloo@earth.li>**20110426232015
 Ignore-this: 798c9bbd4f4f458a7472b356782f3de8
 We could make this conditional, to support old GHC versions, but I
 don't think it is worth the cost to support 6.8. By the time this Cabal
 is released, you will need at least 6.12 (if not higher) to build the
 GHC it comes with.
] 
[Tell hsc2hs where to find cabal_macros.h
Ian Lynagh <igloo@earth.li>**20110426210549
 Ignore-this: 7010d47a062de9400518dc2c29f1b635
] 
[Added documentation about the auto generated version constant
Bas van Dijk <v.dijk.bas@gmail.com>**20110328223503
 Ignore-this: 2008273ee7814cd42956608fd3c3b655
] 
[Use catch from the Prelude in the auto generated Paths_pkgname module
Bas van Dijk <v.dijk.bas@gmail.com>**20110330134005
 Ignore-this: 1135678a83cee52ad85edba161da14cb
 This enables it to be build with GHC-6.8
] 
[Allow Cabal to be build on ghc-6.8
Bas van Dijk <v.dijk.bas@gmail.com>**20110330102036
 Ignore-this: 78657bda84019176c8c0425b2d854624
] 
[Unicode: use wide APIs on Windows and withFilePath on GHC
Max Bolingbroke <batterseapower@hotmail.com>**20110411210758
 Ignore-this: f62d2a95c018f7288374db627d5bf5fd
] 
[Fix for test suite stanzas with conditionals.
Thomas Tuegel <ttuegel@gmail.com>**20110401192113
 Ignore-this: d1160b98be4aedc3c084d37a25a729da
 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.
] 
[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.
] 
[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).
] 
[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
] 
[Always use verbosity slient when calling hc-pkg dump
Duncan Coutts <duncan@community.haskell.org>**20110210200603
 Ignore-this: d2c50f0bde7987559d859579f6ff1fcf
 We don't want to contaminate the hc-pkg output with info/debug messages.
 Coincidentally the messages that current ghc-pkg versions produce at
 -v2 verbosity level do not cause a problem. There's no reason to expect
 future versions to work that way however.
] 
[Fix HcPkg.dump for the case of an empty database
Duncan Coutts <duncan@community.haskell.org>**20110210200111
 Ignore-this: bb604d49d2d6be488ffba50378fed858
 Previously it returned the value [emptyInstalledPackageInfo]
] 
[add --enable-executable-dynamic option for dynamic linking of executables
Jens Petersen <juhp@community.haskell.org>**20110130110206
 Ignore-this: f336897c2ad0ea6560247576d358231f
] 
[Update copyright year
Duncan Coutts <duncan@community.haskell.org>**20110131145403
 Ignore-this: 367addece3538851282fa35dc59a772f
] 
[Add changelog entry for version 1.10.1.0
Duncan Coutts <duncan@community.haskell.org>**20110131145428
 Ignore-this: 7dd98797de68db6c8d1ffc2dc2b5b78b
] 
[Add synopsis field to the installed package info
Duncan Coutts <duncan@community.haskell.org>**20110131003635
 Ignore-this: b94db22dcd5a7753056da9a44fe8c23e
 The description is already included. The one-line synopsis should be
 there too. Note that this is an API change that will affect compilers.
] 
[Rewrite intro to user guide and split into multiple files
Duncan Coutts <duncan@community.haskell.org>**20110130220047
 Ignore-this: f353d514c4c46f241471e6aad485bce9
 The chapter on installing packages still needs to be rewritten
 to describe the cabal tool, rather than runhaskell Setup.hs
] 
[Added unit test for exitcode-stdio-1.0 test suite with and without HPC.
Thomas Tuegel <ttuegel@gmail.com>**20110114165132
 Ignore-this: e69128c5cf06923d4b961753ffaa2ff4
] 
[Fixes for running test suite with HPC.
Thomas Tuegel <ttuegel@gmail.com>**20110113114354
 Ignore-this: 84bf3cb6a47188db0b6fcde5ce1d4eda
] 
[Add a couple TODOs relating to the hpc feature
Duncan Coutts <duncan@haskell.org>**20110131001517
 Ignore-this: c78bbf1d75948431d9740648089eabb6
] 
[Support building libraries and test suites with HPC; automatic report generation.
Thomas Tuegel <ttuegel@gmail.com>**20110130173451
 Ignore-this: cbffdc7d0fb03bd7d6745aa64625cc3c
] 
[Export a bunch of utils for package configurations
Duncan Coutts <duncan@community.haskell.org>**20110129205103
 Ignore-this: b0654528a073185e0c9e9e84330da517
] 
[Get the mapTreeData util from the right place
Duncan Coutts <duncan@community.haskell.org>**20110129204834
 Ignore-this: 9cc5712b72583e94c43a7bab448942e7
 Originally Thomas had moved them to Distribution.PackageDescription
 but I'm rather of the opinion that the functions (and the data
 structure) that they manipluate is ugly and I'd rather keep them
 hidden away in a less public module.
] 
[Support more placeholders in --test-option[s] template
Johan Tibell <johan.tibell@gmail.com>**20110111101957
 Ignore-this: 4a58dba3d8fc411aca1fa7c6c0062398
 
 Now supports $pkgid, $compiler, $os, $arch, and $test-suite.
] 
[Allow name template in --test-option and --test-options
Johan Tibell <johan.tibell@gmail.com>**20110111073013
 Ignore-this: 82ec6b757182c0b3372b50dd1dd9367b
 
 Only $test-suite is supported for now.
] 
[Tracking enabled/disabled TestSuites in PackageDescription.
Thomas Tuegel <ttuegel@gmail.com>**20110110174227
 Ignore-this: 412a5fdbef2dc7fbc7dc698c86917e5e
 This patch adds the 'testEnabled' field to TestSuite. It's 
 undesirable to track build status information in the static package 
 description, but there is no better solution at this time. This 
 patch has the side-effect of fixing several TODOs in 
 Distribution.Simple.Configure.
] 
[Relax QA check on test-suite sections to require only Cabal 1.8
Duncan Coutts <duncan@community.haskell.org>**20110129182623
 Ignore-this: 8d960e7720c5b9c0a23879980a8b3f53
 Only Cabal-1.10 and later can use test suites. Versions of Cabal prior
 to 1.8 actually barf on test-suite sections, while Cabal-1.8 will
 ignore these sections with a warning. Previously the QA check enforced
 that packages with test-suite section specify 'cabal-version: >= 1.10'
 but strictly speaking we only need to require 'cabal-version: >= 1.8'.
 This relaxation allows people to write packages using test suites such
 that people using Cabal-1.8 will be able to build and install the
 package, just not run the test suite. Clear as mud?
] 
[Add --html for haddock command.
Thomas Schilling <nominolo@googlemail.com>**20090816014017
 
 This makes it easier to build both html documentation and a hoogle
 database:
 
   ./setup haddock [--html]   # build only HTML docs (default)
   ./setup haddock --hoogle   # build only Hoogle DB
   ./setup haddock --hoogle --html   # build both
] 
[Look for hsc2hs in the same place as ghc
Ian Lynagh <igloo@earth.li>**20110125200353
 This is particularly important on OS X, where there may be both 32
 and 64bit versions around.
] 
[Follow changes in GHC's linker flag handling
Ian Lynagh <igloo@earth.li>**20110124231819] 
[Add NondecreasingIndentation support for old GHCs
Ian Lynagh <igloo@earth.li>**20110121233655
 Ignore-this: 18b866cd7806e90c13c70e5c9065ea14
] 
[reexport setFileOrdinary/Executable functions from Utils module
Duncan Coutts <duncan@community.haskell.org>**20110117150104
 Ignore-this: 5edb64c3c69ae247ce25ff72dc655baf
] 
[Preserve executable bit during in sdist for extra-source-files
Duncan Coutts <duncan@community.haskell.org>**20110117144243
 Ignore-this: d419dc5d8050d3236a4c78fcad5f7d6b
] 
[Fix a documentation reference to ghc 6.14
Duncan Coutts <duncan@haskell.org>**20101027134319
 Ignore-this: cc05b5066884008491a9c60d6c64782d
] 
[Fix import warnings
Ian Lynagh <igloo@earth.li>**20110115005030
 Ignore-this: 4bc4d971238ed7ef331690bb9b1cbfa3
] 
[Pass gcc/ld locations and flags to configure scripts
Ian Lynagh <igloo@earth.li>**20110115004346
 Flags are passed through the CFLAGS and LDFLAGS variables
] 
[Get extra gcc and ld flags from GHC
Ian Lynagh <igloo@earth.li>**20101220173544] 
[Change my email address
Duncan Coutts <duncan@community.haskell.org>**20110114173347
 Ignore-this: 5ce93c85c0d8e3100c669d363447648a
] 
[Use the standard names for file copy functions rather than a local rename
Duncan Coutts <duncan@haskell.org>**20110114173219
 Ignore-this: 140a927eae404fa4fa96ec86d6fb5682
] 
[sdist perms fix
ramsdell@mitre.org**20101220181308
 Ignore-this: ca0ff71dc7318d12c4f64134c636a08e
] 
[Clarify docs about LocalBuildInfo installedPkgs field
Duncan Coutts <duncan@haskell.org>**20110111005941
 Ignore-this: 73c6ac8cb2b5e0fbd912dfad6a6f9d5f
 Only deps of current package, not all installed packages.
 Confusion reported by quuuux on #haskell.
] 
[Removed documentation for obsolete options to 'setup test' from the User Guide.
Thomas Tuegel <ttuegel@gmail.com>**20110109180811
 Ignore-this: ce7298400abd573023e5c3c1abbef10
] 
[Document the '--{en,dis}able-tests' options in the User Guide
Thomas Tuegel <ttuegel@gmail.com>**20101204164404
 Ignore-this: 28972ba6e70a3e91754dd42bfe9c2a5e
] 
[Update the changelog for 1.8.0.4, 1.8.0.6 and 1.10.0.0
Duncan Coutts <duncan@haskell.org>**20101118203701
 Ignore-this: 2b1693427bd29b84432b1b35a2f627c6
] 
[Replace uses of the old try function with the new one
Ian Lynagh <igloo@earth.li>**20101218230920
 Ignore-this: e0a9db2f97bc3f90ceb5772944f4e25b
] 
[Replace uses of the old catch function with the new one
Ian Lynagh <igloo@earth.li>**20101218213608] 
[Add GADTSyntax to extension list
Ian Lynagh <igloo@earth.li>**20101218150259] 
[Allow CABAL_VERSION to be defined when bootstrapping
Ian Lynagh <igloo@earth.li>**20101212213359
 Needed for the GHC build system
] 
[Add NondecreasingIndentation to Language.Haskell.Extension
Ian Lynagh <igloo@earth.li>**20101124223953
 Ignore-this: 2d072a45d76770cf97553b0e5df9e998
] 
[Export commandParseArgs
Duncan Coutts <duncan@haskell.org>**20101105140655
 Ignore-this: f452f13b130e886ecd8262c6f24a0c52
] 
[Add some more extensions that GHC knows about
Ian Lynagh <igloo@earth.li>**20101026220409
 Ignore-this: 92bbbb269985fe576798cd2cdba4ceca
] 
[Whitespace only
Ian Lynagh <igloo@earth.li>**20101026220403
 Ignore-this: 8746b070884de3ed45db486a0a49db3e
] 
[Fix parsing of empty default-language fields
Ian Lynagh <igloo@earth.li>**20101026220312
 Ignore-this: 99011d6c9af431e7c8d90c3cee364606
] 
[Add support for general extension en/disabling
Ian Lynagh <igloo@earth.li>**20101026145503] 
[Tweak a couple of types
Ian Lynagh <igloo@earth.li>**20101026131250] 
[Generalise deprecatedExtensions
Ian Lynagh <igloo@earth.li>**20101026131121
 It now works with Extensions rather than KnownExtensions
] 
[Split known-extensions off into their own type, and remove knownExtensions
Ian Lynagh <igloo@earth.li>**20101025232624
 The knownExtensions list had already got out of sync with the datatype.
 Now we use an Enum instance to get the list of constructors.
 Also, having the actual extensions in a separate type than UnknownExtension
 and EnableExtension makes it easier to add extension disabling support
 later.
] 
[Add a test program to look for ghc extensions that are not registered
Duncan Coutts <duncan@haskell.org>**20101025163536
 Ignore-this: cf38e2434eba386b83b818a29fd5ac14
 Should live in the ghc testsuite but no harm having it here too.
] 
[Make the .cabal file fully 1.10-compliant
Ian Lynagh <igloo@earth.li>**20101020133037
 Ignore-this: 66409062c8d4b698f69aa58a83b85ef1
 Add Default-Language field, and change Extensions to Default-Extensions.
] 
[Require "cabal-version: >= 1.10" as we use the new testsuite syntax
Ian Lynagh <igloo@earth.li>**20101020131829
 Ignore-this: 6aecdd77f78234f0359af0509f1ba636
] 
[Fix warnings: Remove duplicate imports
Ian Lynagh <igloo@earth.li>**20101020125710
 Ignore-this: dea9d889078c729459e1ab92a8e54c08
] 
[Merge conflicts
Ian Lynagh <igloo@earth.li>**20101020112200
 Ignore-this: d96cab403511f914d9d8df1a29ca58ee
] 
[Add final newline
Simon Marlow <marlowsd@gmail.com>**20101013125337
 Ignore-this: 99e055c7186219369902a63c63c3fd76
 Something in the Windows build was complaining about the lack of a
 final newline.
] 
[Update the pretty printer to the current testsuite interface
Duncan Coutts <duncan@haskell.org>**20101020120506
 Ignore-this: 480a349e93be8228f81f93632cabe2c7
] 
[Improve error messages about programs not being found
Duncan Coutts <duncan@haskell.org>**20101019074436
 Ignore-this: 9b4daf9a09179482049146669af59f76
 Make it clear it is a program we are talking about, not a library.
] 
[Add a note about the remaining issue with runhugs scripts
Duncan Coutts <duncan@haskell.org>**20101018232248
 Ignore-this: 3e83a3238d08cdb3ad9e353d43fbf7fa
] 
[Add package QA checks for the new language and extensions fields
Duncan Coutts <duncan@haskell.org>**20101018180343
 Ignore-this: a063fd21e86e4e19b8152258c5a0711f
] 
[Check at configure time that languages are supported by the compiler
Duncan Coutts <duncan@haskell.org>**20101018180300
 Ignore-this: e3988c2eff46129b1f2732cd9647c935
] 
[Add compiler support for using the new languages and extensions fields
Duncan Coutts <duncan@haskell.org>**20101018180151
 Ignore-this: ec1b61767d492dcd2dfa6a07ace3b982
] 
[Add hugs support for the languages and extensions fields
Duncan Coutts <duncan@haskell.org>**20101018175647
 Ignore-this: 9b39c392119aebbbad22a64dcf992f88
 Incidentally, should fixe ticket #43.
] 
[Add parsing for the new language and extensions fields
Duncan Coutts <duncan@haskell.org>**20101018091918
 Ignore-this: c59c8ef96c83f35e293c8f495b89fda6
] 
[Add new language and extensions fields (internal data structures)
Duncan Coutts <duncan@haskell.org>**20101018090620
 Ignore-this: f49dd9278b0053bc441a37beeb2f6145
 New fields default-language and other-languages for specifying the
 base languages for the package, e.g. Haskell98, Haskell2010
 New fields default-extensions and other-extensions for the language
 extensions. Separate from the old extensions field.
 The separation lets us express the difference between declaring to
 the outside world that a package uses certain languages or extensions
 and whether certain languages or extensions should be applied to
 all modules in the package component.
] 
[Extend the Compiler interface to list the supported languages
Duncan Coutts <duncan@haskell.org>**20101018082608
 Ignore-this: 8b1ab7cc14f35dd6604c2a85173ad48
] 
[Add a Language type, starting with Haskell98 and Haskell2010
Duncan Coutts <duncan@haskell.org>**20101018082208
 Ignore-this: de80df5317b5d44900e30c947a86364b
] 
[Merge and tweaks following pretty printer changes
Duncan Coutts <duncan@haskell.org>**20101018195344
 Ignore-this: 513a2b0ce02fed98f5beba0dd893eb16
] 
[pretty printer fixes (FreeText starting with ., version tags, version range parens, option order).
jnf@arcor.de**20101011094517
 Ignore-this: 400ac5be014f1529632bd16ffd878a92
] 
[reentered accidentally lost exports
jnf@arcor.de**20100929105852
 Ignore-this: 2ad4ecfac6feba4c2a59a131c05c8a40
] 
[new cabal pretty printer.
jnf@arcor.de**20100929103653
 Ignore-this: 43f954ec31373e327f2c29fcbf3f0865
] 
[Fix old doc links
Duncan Coutts <duncan@haskell.org>**20100727012425
 Ignore-this: 9e9d0f2045adebe7bb38b5d1a7d2d71a
] 
[Add note about ticket #689 about deprecated extensions
Duncan Coutts <duncan@haskell.org>**20100622151328
 Ignore-this: 56cf0027a4c10f4c07045e2ccdbb819c
] 
[Head version needs cabal-version: >=1.8 due to test stanza
Duncan Coutts <duncan@haskell.org>**20101017155521
 Ignore-this: 6652a529071ccb2eb1cdeda3451aac30
] 
[Remove unused cpp version definition
Duncan Coutts <duncan@haskell.org>**20101017155218
 Ignore-this: 8dc3425bd811d60d28c2eaf365ec1e66
] 
[Change the way we handle the version number during bootstrapping
Duncan Coutts <duncan@haskell.org>**20101016191252
 Ignore-this: e21559acc28b7bd811dc4fe147e645b2
 Means we only need to have the version in one place now. Yay.
] 
[Restore compatability with ghc-6.8 and 6.6 but drop support for ghc-6.4
Duncan Coutts <duncan@haskell.org>**20101016182714
 Ignore-this: 6aef933e4bfb4a9c47021d17370805ea
] 
[Add the Cabal unit tests as a test-suite stanza
Duncan Coutts <duncan@haskell.org>**20101016165656
 Ignore-this: b9abbfe867754b8bf5b02919c1f25509
 Still some other tests that need hooking up to this mechanism
] 
[Update the unit tests of the testsuite feature
Duncan Coutts <duncan@haskell.org>**20101016165615
 Ignore-this: bc08d2a8609943f40e901c42916072c2
] 
[Rename test --human-log to just --log
Duncan Coutts <duncan@haskell.org>**20101016153441
 Ignore-this: a2ccb95759a67ae2888a2db2d2ba678d
 Still have --machine-log as a separate flag
] 
[Remove the test --append-human-log and --replay features
Duncan Coutts <duncan@haskell.org>**20101016153235
 Ignore-this: 23d9c6431f929cd4078c54e03928cef2
] 
[Add instance Text TestShowDetails parsing and use it for --show-details flag
Duncan Coutts <duncan@haskell.org>**20101016153015
 Ignore-this: 1018e874b8acbf51bd7081df1210285
 Rather than Read/Show
] 
[Fix a cabal-version check so it accepts the field missing entirely
Duncan Coutts <duncan@haskell.org>**20101016151929
 Ignore-this: e30f6fe6e7f54cc5c791a3b6761e93de
] 
[Add testsuites to the allBuildInfo function, used mainly in checks
Duncan Coutts <duncan@haskell.org>**20101013172229
 Ignore-this: be876b609bf1266f3928f25e94f87703
] 
[Update the message for a package check
Duncan Coutts <duncan@haskell.org>**20101013172206
 Ignore-this: 875cc7c6a763321f2e3251195c9dfb1e
] 
[Add a few TODOs about package checks
Duncan Coutts <duncan@haskell.org>**20101013172128
 Ignore-this: 837bda043d740f0b92549f3379d43909
] 
[Check test-suite sections even when they have been disabled at configure time
Duncan Coutts <duncan@haskell.org>**20101013171851
 Ignore-this: 938113ec297b2e5c511a72c5ac8a86d
] 
[Default to Haskell98 for GHC 7.x
Duncan Coutts <duncan@haskell.org>**20101013022258
 Ignore-this: c34b946f55e5ec054cc842914f58b5a5
 GHC 7 defaults to Haskell2010, we stick with 98 for the moment.
 We will later introduce a new language field to control this.
] 
[Change the syntax and behaviour of the cabal-version field
Duncan Coutts <duncan@haskell.org>**20101013014933
 Ignore-this: c4cb33360d623ff312b5c3f2d78f730c
 For historical reasons the cabal-version is specified with a version range,
 to indicate the range of versions of tools that the package will work with.
 We now think it makes more sense to specify the version of the Cabal spec
 that the package follows. Old Cabal versions will not be able to parse simple
 versions in this field. So we initially make the parser allow plain versions
 but then we add a check to warn about using it prior to Cabal-1.12 at which
 point it will be allowed.
 Added a check about using version ranges that are not of the form '>= x.y'.
 Also change behaviour to ignore upper bounds in the given version range.
] 
[Fix duplicate import warnings
Ian Lynagh <igloo@earth.li>**20101012131227
 Ignore-this: a9b51a864f95206f4d972f1e7506be55
] 
[Remove the ghc Makefile stuff for the old docbook xml
Duncan Coutts <duncan@haskell.org>**20101010210026
 Ignore-this: 6c714ba98b60e15e44577b64d2de3e1c
 Not woth keeping it, none of it can sensibly be reused. The GHC
 devs will need to add something new for the markdown user guide.
] 
[Update Makefile for new markdown user guide
Duncan Coutts <duncan@haskell.org>**20101010205938
 Ignore-this: dcb5bd072c619516e23329f170458d72
] 
[Add a FIXME about parsing cabal files
Duncan Coutts <duncan@haskell.org>**20101010203421
 Ignore-this: 12804d54e81b5ea5878e52628717bc1d
] 
[Refactor the missing VCS info QA check
Duncan Coutts <duncan@haskell.org>**20101010192346
 Ignore-this: fa6a50a9bd43cf9069e7cd16e23a2b4e
 Starting with Marc Weber's code and just moving
 it about and making it fit in a bit nicer.
] 
[Remove redundant import
Duncan Coutts <duncan@haskell.org>**20101010190724
 Ignore-this: a978a6a257a31a57d07d57471f04af49
] 
[Rename LocalBuildInfo extraArgs to extraConfigArgs to avoid name clashes
Duncan Coutts <duncan@haskell.org>**20101010190036
 Ignore-this: 817061002399a51cbf31da2ba002737b
] 
[Add a bunch of TODOs about the test feature
Duncan Coutts <duncan@haskell.org>**20101010173245
 Ignore-this: f2acc005fef4996a2c5260356eaf219f
] 
[Change how the test suite interfaces are represented, parsed and used
Duncan Coutts <duncan@haskell.org>**20101010162526
 Ignore-this: 8773e7756fc23bc04c9e5b2b14031512
 Also, stick to version 0.9 of the "detailed" test interface, since it's
 not quite finalised yet. Misc other minor code cleanups.
] 
[Added test suites to Cabal User Guide
Thomas Tuegel <ttuegel@gmail.com>**20100811141332
 Ignore-this: 3975acc803fdba809ca1c8abeef21677
 Ticket #215 (Overhaul support for packages' tests).
] 
[Removed "$stdio" from acceptable template variables
Thomas Tuegel <ttuegel@gmail.com>**20100810201828
 Ignore-this: c50e05e9a73c726567eff0a364f29750
 Ticket #215 (Overhaul support for packages' tests).  In the usage message, the
 template variable "$stdio" was incorrectly listed as being available in the
 "--human-log" and "--machine-log" flags.  The variable has been removed.
] 
[Added --test-option(s) flags
Thomas Tuegel <ttuegel@gmail.com>**20100809161341
 Ignore-this: cea82267bbc0b16d5f21bfc086285905
 Ticket #215 (Overhaul support for packages' tests).  This patch adds the
 --test-option(s) flags for passing command-line options to test executables.
] 
[Respect verbosity flag when outputting test log
Thomas Tuegel <ttuegel@gmail.com>**20100809151517
 Ignore-this: 73668e49eeea216c27b5233c7e3fe2cb
 Ticket #215 (Overhaul support for packages' tests).  This patch corrects the
 printing of the human-readable test log to the terminal so the setting of the
 verbosity flag is respected.
] 
[Added --replay option to cabal test
Thomas Tuegel <ttuegel@gmail.com>**20100803164932
 Ignore-this: c97d70e21d3847aa4d889304a7e94451
 Ticket #215 (Overhaul support for packages' tests).  This patch adds support for
 using machine logs from previous runs to replay tests with the same options.
 When using --replay, Cabal will replay all test suites listed in the machine log
 specified; test suite names specified on the command line are ignored.
] 
[Renamed "library" test suite type to "detailed"
Thomas Tuegel <ttuegel@gmail.com>**20100803141125
 Ignore-this: 457c1a155020303962ae55b2bcd8415c
 Ticket #215 (Overhaul support for packages' tests).
] 
[Fixed human test log output for failing tests
Thomas Tuegel <ttuegel@gmail.com>**20100803030246
 Ignore-this: f9d3ef127cdb849762af79f31a0c80c9
 Ticket #215 (Overhaul support for packages' tests).  This patch corrects the bug
 in the human test log output to terminal where the line wrapping code in Cabal
 caused terminal control codes output by the test framework to be placed
 incorrectly.  Line wrapping is no longer performed.
] 
[Displaying human-readable test log when requested
Thomas Tuegel <ttuegel@gmail.com>**20100730151818
 Ignore-this: 98f0adb8e47a52a59ccb3581982157ed
 Ticket #215 (Overhaul support for packages' tests).  This patch causes Cabal to
 display the contents of the human-readable log file on the terminal when run 
 with --show-details=always or when run with --show-details=failures and a 
 failure is detected.  The structure of the test logging code has been changed 
 for clarity to debug a problem where test executables that write to their stderr 
 channel disrupt terminal output.
] 
[Added debugging output to test summary
Thomas Tuegel <ttuegel@gmail.com>**20100730134008
 Ignore-this: 826d20639f17ae0650d1c9b8a56b43a7
 Ticket #215 (Overhaul support for packages' tests).
] 
[Using correct name of log file in human-readable log
Thomas Tuegel <ttuegel@gmail.com>**20100730041720
 Ignore-this: 3c6df44f5d6414ce1fe2b58c50590726
 Ticket #215 (Overhaul support for packages' tests).  Previously, human-readable
 logs listed the name of the temporary file where test suite output is
 initially logged.
] 
[Renamed option '--test-filter' to '--show-details'
Thomas Tuegel <ttuegel@gmail.com>**20100730023026
 Ignore-this: 8b78eed5ccf9cb7ed6a55b86d886e5cc
 Ticket #215 (Overhaul support for packages' tests).
] 
[Displaying location of test suite log on terminal
Thomas Tuegel <ttuegel@gmail.com>**20100729141159
 Ignore-this: e98a67180c6ff1511b86e442f9acf3c1
 Ticket #215 (Overhaul support for packages' tests).  It was decided that
 indicating the location of the human-readable test suite log made Cabal's test
 runner easier to use.
] 
[Passing names of test suites to run to test stage
Thomas Tuegel <ttuegel@gmail.com>**20100726150811
 Ignore-this: bf556a0a06fe26b132f1eb5caec21805
 Ticket #215 (Overhaul support for packages' tests).
] 
[Fixed deprecation warning in Distribution.TestSuite
Thomas Tuegel <ttuegel@gmail.com>**20100726141448
 Ignore-this: 64cd6a5a936efd6b0ee0f50564440a9d
 Ticket #215 (Overhaul support for packages' tests).  Warning resulted from use
 of Control.OldException.
] 
[Fixed help message for machine-log path template
Thomas Tuegel <ttuegel@gmail.com>**20100724164652
 Ignore-this: 52205830166a307eedce807e908f7a0a
 Ticket #215 (Overhaul support for packages' tests).  The message previously
 indicated that $test-suite is acceptable in the machine log path template,
 which is not true.
] 
[Catching exceptions when lifting pure tests to IO
Thomas Tuegel <ttuegel@gmail.com>**20100724134336
 Ignore-this: 89a2265a94ee0082935d236dd64c12d4
 Ticket #215 (Overhaul support for packages' tests).
] 
[Using common function to name path environment variables in PathsModule and Test
Thomas Tuegel <ttuegel@gmail.com>**20100722145840
 Ignore-this: 5cea1a3e77acb84a162de3d1c85a3fe6
 Ticket #215 (Overhaul support for packages' tests).  The names of environment
 variables used to set package paths at runtime were previously hard-coded into
 the function that generates the paths module.  A function generating the
 variable names is now exported from Distribution.Simple.Build.PathsModule and
 used to set the datadir in Distribution.Simple.Test to prevent breakage if the
 naming scheme changes.
] 
[Added documentation for machine-readable test log types
Thomas Tuegel <ttuegel@gmail.com>**20100722140017
 Ignore-this: 60f934e11b1c3ee4df9f48677528af47
 Ticket #215 (Overhaul support for packages' tests).
] 
[Improved documentation for Distribution.TestSuite
Thomas Tuegel <ttuegel@gmail.com>**20100722124239
 Ignore-this: f7b1261270c4815b0691ce33c664908c
 Ticket #215 (Overhaul support for packages' tests).
] 
[Fixed documentation errors in Distribution.Simple.Test
Thomas Tuegel <ttuegel@gmail.com>**20100721221844
 Ignore-this: b111e727b4a556b17c2a1eb4dfd6971b
 Ticket #215 (Overhaul support for packages' tests).
] 
[Renamed Distribution.TestSuite.optionLookup to lookupOption
Thomas Tuegel <ttuegel@gmail.com>**20100721170724
 Ignore-this: 3a5e79fd0a14d974e664a74af5cb83d1
 Ticket #215 (Overhaul support for packages' tests.)
] 
[Added console-style test summary information to human-readable logs
Thomas Tuegel <ttuegel@gmail.com>**20100721163516
 Ignore-this: 494c2220285ef4bda036ecdfd7242adf
 Ticket #215 (Overhaul support for packages' tests).
] 
[Added flag allowing human-readable test logs to be appended instead of overwritten
Thomas Tuegel <ttuegel@gmail.com>**20100721160421
 Ignore-this: f157a4830f82a4a978c1cfb1931a0258
 Ticket #215 (Overhaul support for packages' tests).
] 
[Added clarifying comments to Distribution.Simple.Test
Thomas Tuegel <ttuegel@gmail.com>**20100721160417
 Ignore-this: 100000890351a75557a6dfa0f71c419f
 Ticket #215 (Overhaul support for packages' tests).
] 
[Using a separate PathTemplateEnv for machine test logs
Thomas Tuegel <ttuegel@gmail.com>**20100720204724
 Ignore-this: 4920c6e88b8d3d3d788ba42d6b5268af
 Ticket #215 (Overhaul support for packages' tests).  Previously, the use of a
 dummy test suite name would lead to unintuitive expansions of the PathTemplate
 governing the location of the machine-readable package test log.
] 
[Exporting machine log types from Distribution.Simple.Test
Thomas Tuegel <ttuegel@gmail.com>**20100720204558
 Ignore-this: 6920621dbabf471cef7d688904b9b1b8
 Ticket #215 (Overhaul support for packages' tests).  These types were exported
 to enable parsing of test logs by external utilities.
] 
[Added 'check' and 'optionLookup' to Distribution.TestSuite
Thomas Tuegel <ttuegel@gmail.com>**20100720134707
 Ignore-this: 21ef44dc0087ff8333b1722309f8fbdd
 Ticket #215 (Overhaul support for packages' tests).  These functions were added
 for the benefit of test runner authors.
] 
[Saving Options from test runs for reproducability
Thomas Tuegel <ttuegel@gmail.com>**20100715180003
 Ignore-this: 858c387d83e93e193f7c66df3901f6e3
 Ticket #215 (Overhaul support for packages' tests).  Saving the Options used
 required changes to the TestSuite interface, with the Option values now being
 specified as Strings and not Dynamics.  This was necessary because the lack of
 a Read instance for Dynamic.
] 
[Improvements to test suite logging
Thomas Tuegel <ttuegel@gmail.com>**20100715020549
 Ignore-this: b47f4358302b283e93ccaff81db123f2
 Ticket #215 (Overhaul support for packages' tests).  This patch includes proper
 support for both machine- and human-readable logs.
] 
[Removed duplicate code for test suite interface version checks
Thomas Tuegel <ttuegel@gmail.com>**20100713144835
 Ignore-this: e06c264351013480a66c013ca398db4b
 Ticket #215 (Overhaul support for packages' tests).  Duplicate code for checking
 the test suite interface version was replaced with a single function
 'testVersion1 :: Version -> Bool' exported from Distribution.PackageDescription.
] 
[Added QA checks for test suite name conflicts
Thomas Tuegel <ttuegel@gmail.com>**20100712154401
 Ignore-this: df13e2f16cf4e879f5d5f6538c6e7db8
 Ticket #215 (Overhaul suppport for packages' tests).
] 
[New test suite log format
Thomas Tuegel <ttuegel@gmail.com>**20100708132650
 Ignore-this: 96a300e6acedd0de63757713fbb1d832
 Ticket #215 (Overhaul support for package's tests).  This patch adds a new test
 log file format based on the TestSuiteLog data structure.  The interface between
 Cabal and the library test suite runner has consequently changed.
] 
[Inheriting existing environment for test suite executables
Thomas Tuegel <ttuegel@gmail.com>**20100707222244
 Ignore-this: 6f08245c83817a85c7da5a05f810abd6
 Ticket #215 (Overhaul support for packages' tests).  Previously, the test
 runner replaced the environment for test suite executables with one containing
 only the datadir path for package data files.  For test suites invoking other
 programs, it is necessary to preserve the system paths, so the datadir path
 variable is appended to the inherited environment.
] 
[Improvements to library test suite runner, including documentation
Thomas Tuegel <ttuegel@gmail.com>**20100624181304
 Ignore-this: 45baa7905de5423e91707f52e590bbad
 Ticket #215 (Overhaul support for packages' tests).
] 
[Renamed 'result' and 'getResult' to 'run' and 'runM'
Thomas Tuegel <ttuegel@gmail.com>**20100623184640
 Ignore-this: 7bb6dd598eaa135fcbf73e82ab0d2ce2
 Ticket #215 (Overhaul support for packages' tests).
] 
[Setting datadir environment variables when running tests
Thomas Tuegel <ttuegel@gmail.com>**20100623183201
 Ignore-this: 7a9e26c684417871609847f6e4d4883e
 Ticket #215 (Overhaul support for packages' tests).
] 
[Added convenience functions and default instances making export of 'Test' constructors unnecessary
Thomas Tuegel <ttuegel@gmail.com>**20100623151934
 Ignore-this: 1979265e345e268787b5b6fe49bdfd64
 Ticket #215 (Overhaul support for packages' tests).
] 
[Added support for running the default stub executables Cabal creates for library test suites
Thomas Tuegel <ttuegel@gmail.com>**20100623151903
 Ignore-this: 2be1bbfb07a7fc0e3a0d2c9e5bdf2252
 Ticket #215 (Overhaul support for packages' tests).
] 
[Removed dependency on extensible-exceptions from detailed test suite interface
Thomas Tuegel <ttuegel@gmail.com>**20100623150227
 Ignore-this: 50ad3ee8c2dc5f62b48aa84d0318c3e6
 Ticket #215 (Overhaul support for packages' tests).
] 
[Added support for building detailed library test suites
Thomas Tuegel <ttuegel@gmail.com>**20100623150222
 Ignore-this: 1f2a6034af9adf493088265cc8481df5
 Ticket #215 (Overhaul support for packages' tests).  This patch preprocesses
 and builds library test suites.  The fake packages are created for each test
 suite, where the fake package and test suite share the same name; the packages
 and libraries are registered in the inplace package database so that test
 agents can build stub executables against them.
] 
[Improved security of test log file creation
Thomas Tuegel <ttuegel@gmail.com>**20100621114726
 Ignore-this: 6fed3aa4ebcb587b48bb2a256fcbc61b
 Ticket #215 (Overhaul support for packages' tests).  The algorithm previously
 used to name the log files for test output suffers from a known vulnerability
 due to the predictability of chosen names.
] 
[Added detailed test interface
Thomas Tuegel <ttuegel@gmail.com>**20100617210631
 Ignore-this: 161624662d6ec7946a33415ddbff4445
 Ticket #215 (Overhaul support for packages' tests).  This patch provides the
 detailed test interface for exposing individual tests to Cabal and other test
 agents.  It also provides the simple function Cabal will provide as the default
 test runner.
] 
[Fixed test suite breakage due to TestSuite API changes
Thomas Tuegel <ttuegel@gmail.com>**20100629212935
 Ignore-this: 8de228836efb206e1adb833c841ae757
 Ticket #215 (Overhaul support for packages' tests).  The update to the
 TestSuite parser which stopped disallowed configurations during parsing also
 broke the existing test suite with API changes.
] 
[Added --test-filter flag
Thomas Tuegel <ttuegel@gmail.com>**20100624175917
 Ignore-this: e8fcaddf34a42326d0f3a1081aafb724
 Ticket #215 (Overhaul support for packages' tests).
] 
[Qualified import of Distribution.Simple.Setup in Distribution.Simple.Haddock
Thomas Tuegel <ttuegel@gmail.com>**20100623193755
 Ignore-this: ec5750f56b22f67e5862036fcdd8ecee
] 
[Using path templates to name test log files
Thomas Tuegel <ttuegel@gmail.com>**20100622162317
 Ignore-this: af6564bf6154e29e363ee343c9fc5806
 Ticket #215 (Overhaul support for packages' tests).
] 
[More docs about the meaning of the cabal-version field
Duncan Coutts <duncan@haskell.org>**20101010154251
 Ignore-this: 381ede9227f7a9db78f1007364660648
] 
[Document how Cabal-Version affects behaviour of build-depends
Ben Millwood <haskell@benmachine.co.uk>**20100926025550
 Ignore-this: ba6367db93c15906331457a0468db436
] 
[initial support for building executables with UHC
Atze Dijkstra <atze@cs.uu.nl>**20100923214130
 Ignore-this: bbbf1adcec2fcfe87ce1db18c804f21a
] 
[Added flags related to UHC, uhcbase package
Atze Dijkstra <atze@cs.uu.nl>**20100706115341
 Ignore-this: f7dd2b14e3146f8844635ddcb70ac3b9
] 
[Minor changes to the auto-reconfiguration feature.
Duncan Coutts <duncan@haskell.org>**20101010144111
 Ignore-this: 944f595482ea42eb1907fb1150d6d4c0
 Change the messages slightly. Make configure return the
 new lbi, rather than having to re-read the lbi from file
 (avoiding potential infinite loop if the IO failed).
] 
[Auto-reconfiguration when .cabal is newer than setup-config
Dmitry Astapov <dastapov@gmail.com>**20100825131106
 Ignore-this: 22ab2b6de0251f6cf1da7c2538544d4
 
 This patch adds "ConfigFlags" to the "LocalBuildInfo" and reuses them to
 perform "configureAction" when .cabal file is changed. This has
 the same effect as re-running "configure" with the most recent used
 set of options, which should be the sensible thing to do.
 
 Closes #294, #477, #309 and #518.
] 
[Fix processing of ghc-shared-options
Duncan Coutts <duncan@haskell.org>**20101009204809
 Ignore-this: 571b3d70fbc705282b9fdfdafdc2f009
 Original patch was:
   Sun Oct  7 13:41:53 BST 2007  Thorkil Naur <naur@post11.tele.dk>
     * Fix processing of shared options
 Re-recorded due to code churn
] 
[Correct spelling of 'transative'
Duncan Coutts <duncan@haskell.org>**20101009202836
 Ignore-this: fe7ec5ae621135024403ae0aa42094c2
 Original patch by:
   Thu Aug 21 21:19:51 MDT 2008  dbueno@gmail.com
     * Correct spelling of 'transative'.
 Re-recorded due to conflict.
] 
[print a warning if repository location isn't specified and the cabal project looks like being tracked by a version control system
marco-oweber@gmx.de**20091129192013
 Ignore-this: 5ce5073f1793193e437353490eff0276
] 
[Bump Cabal HEAD version to 1.11.0
Duncan Coutts <duncan@haskell.org>**20101010154518
 Ignore-this: 407e2b1c0de8c10f399841b3fbea1dd3
] 
[TAG 1.10 branch forked
Duncan Coutts <duncan@haskell.org>**20101010155050
 Ignore-this: 7b0241166f919e2a374a2a69669b2e6b
] 
Patch bundle hash:
ba67b7f8b2f2610cbbac97878246845756fc1546