[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, ghc-head, master, metainfo, v2.15, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T8584, wip/T9840, wip/api-ann-hstylit, wip/api-ann-hstylit-1, wip/api-ann-hstylit-2, wip/api-ann-hstylit-3, wip/api-ann-hstylit-4, wip/api-ann-hstylit-5, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/ast-annotations-separate, wip/ast-prepare-annotations, wip/ast-prepare-annotations-final, wip/ast-prepare-annotations-final2, wip/ast-prepare-annotations-final3, wip/ast-prepare-annotations-final4, wip/ast-prepare-annotations-final5, wip/ast-prepare-annotations-final6, wip/attoparsec-update, wip/landmine-param-family, wip/orf-new, wip/orf-reboot, wip/pattern-synonyms, wip/rae, wip/remove-cabal-dep, wip/trac-9744: Remove doctest dependency (8857e50)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/attoparsec-update,wip/landmine-param-family,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/remove-cabal-dep,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/8857e5071f0c0eb8398b06d63104bbe844d3df25

>---------------------------------------------------------------

commit 8857e5071f0c0eb8398b06d63104bbe844d3df25
Author: Simon Hengel <sol at typeful.net>
Date:   Wed Jun 18 14:16:48 2014 +0800

    Remove doctest dependency
    
    (so that we can use haddock-library with doctest)


>---------------------------------------------------------------

8857e5071f0c0eb8398b06d63104bbe844d3df25
 .travis.yml                           |  5 +++--
 haddock-library/haddock-library.cabal |  8 --------
 haddock-library/test/doctests.hs      | 11 -----------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab626be..f446081 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ install:
      "head") (cd haddock-library/ && cabal install --enable-tests
               && cd .. && cabal install --only-dependencies --enable-tests) ;;
      *)
-       (cd haddock-library/ && cabal install --only-dependencies --enable-tests && cd ..) ;;
+       (cd haddock-library/ && cabal install --only-dependencies --enable-tests) ;;
 
     esac
 
@@ -26,7 +26,8 @@ script:
   # Yes, in case of HEAD we do end up building haddock-library twice
   # but we want to see the test results.
   - (cd haddock-library/ && cabal configure --enable-tests --ghc-options=-Werror
-     && cabal build && cabal test && cabal install && cd ..)
+     && cabal build && cabal test && cabal install && cabal install doctest
+     && doctest -isrc -ivendor/attoparsec-0.10.4.0 -optP-include -optPdist/build/autogen/cabal_macros.h src/Documentation/Haddock/Parser.hs)
   - case "$GHCVER" in
      "head") (cabal configure --enable-tests --ghc-options=-Werror && cabal build && cabal test) ;;
      *) ;;
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 8af94a4..20e0e94 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -73,14 +73,6 @@ test-suite spec
     , deepseq
     , QuickCheck == 2.*
 
-test-suite doctests
-  type:             exitcode-stdio-1.0
-  default-language: Haskell2010
-  hs-source-dirs:   test
-  main-is:          doctests.hs
-  ghc-options:      -threaded
-  build-depends:    base, doctest >= 0.8
-
 source-repository head
   type:     git
   subdir:   haddock-library
diff --git a/haddock-library/test/doctests.hs b/haddock-library/test/doctests.hs
deleted file mode 100644
index e4f9385..0000000
--- a/haddock-library/test/doctests.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-module Main where
-
-import           Test.DocTest
-
-main :: IO ()
-main = doctest [
-    "-isrc"
-  , "-ivendor/attoparsec-0.10.4.0"
-  , "-optP-include", "-optPdist/build/autogen/cabal_macros.h"
-  , "src/Documentation/Haddock/Parser.hs"
-  ]