From 25badd84cf6e09f4e556c7511a78144d38578d9f Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 24 Sep 2012 10:07:44 +0200
Subject: Add test-suite section for parsetests to cabal file

+ get rid of HUnit dependency
---
 haddock.cabal | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'haddock.cabal')

diff --git a/haddock.cabal b/haddock.cabal
index f70d6813..3486b2f7 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -212,6 +212,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
-- 
cgit v1.2.3


From 34953914bf4d577a9609e7e291eca43c45b29aba Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 24 Sep 2012 11:35:28 +0200
Subject: Remove test flag from cabal file

This was not really used.
---
 haddock.cabal | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'haddock.cabal')

diff --git a/haddock.cabal b/haddock.cabal
index 3486b2f7..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
 
-- 
cgit v1.2.3