diff options
| author | David Waern <david.waern@gmail.com> | 2012-09-28 23:42:28 +0200 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2012-09-28 23:42:28 +0200 |
| commit | eb44b441af0cf6d1fcc68f10ea4a8758f03f2ad9 (patch) | |
| tree | e1c04862a2205de88f48f545ffde03424a9e8dfc /haddock.cabal | |
| parent | 6ccf78e15a525282fef61bc4f58a279aa9c21771 (diff) | |
| parent | 34953914bf4d577a9609e7e291eca43c45b29aba (diff) | |
Merge branch 'ghc-7.6' of http://darcs.haskell.org/haddock into ghc-7.6
Diffstat (limited to 'haddock.cabal')
| -rw-r--r-- | haddock.cabal | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/haddock.cabal b/haddock.cabal index f70d6813..bbd4e755 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -72,10 +72,6 @@ flag in-ghc-tree default: False manual: True -flag test - default: False - manual: True - executable haddock default-language: Haskell2010 -- In a GHC tree - in particular, in a source tarball - we don't @@ -99,10 +95,6 @@ executable haddock else build-depends: ghc-paths - if flag(test) - cpp-options: -DTEST - build-depends: QuickCheck >= 2.1 && < 3 - main-is: Main.hs hs-source-dirs: src ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs @@ -160,10 +152,6 @@ library else build-depends: ghc-paths - if flag(test) - cpp-options: -DTEST - build-depends: QuickCheck >= 2.1 && < 3 - hs-source-dirs: src ghc-options: -funbox-strict-fields -O2 -Wall -fwarn-tabs @@ -212,6 +200,34 @@ test-suite html-tests hs-source-dirs: tests/html-tests build-depends: base, directory, process, filepath, Cabal +test-suite spec + type: exitcode-stdio-1.0 + default-language: Haskell2010 + main-is: parsetests.hs + hs-source-dirs: + tests/unit-tests + , tests/nanospec + , src + + build-depends: + base + , ghc + , containers + , array + + -- NOTE: As of this writing, Cabal does not properly handle alex/happy for + -- test suites. We work around this by adding dist/build to hs-source-dirs, + -- so that the the generated lexer/parser from the library is used. I + -- addition we depend on 'haddock', so that the library is compiled before + -- the test suite. + -- + -- The corresponding cabal ticket is here: + -- https://github.com/haskell/cabal/issues/943 + hs-source-dirs: + dist/build + build-depends: + haddock + source-repository head type: git location: http://darcs.haskell.org/haddock.git |