diff options
| author | Simon Hengel <sol@typeful.net> | 2014-06-18 14:16:48 +0800 |
|---|---|---|
| committer | Simon Hengel <sol@typeful.net> | 2014-06-18 14:16:48 +0800 |
| commit | 8857e5071f0c0eb8398b06d63104bbe844d3df25 (patch) | |
| tree | 02386753282603e2dd0f0cd555f571d3ab5c27e7 | |
| parent | 1bbda54a9cf1c8db93c5ef226c2a94ed38a842ff (diff) | |
Remove doctest dependency
(so that we can use haddock-library with doctest)
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | haddock-library/haddock-library.cabal | 8 | ||||
| -rw-r--r-- | haddock-library/test/doctests.hs | 11 |
3 files changed, 4 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index ab626be9..f4460819 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,8 +26,9 @@ 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) ;; *) ;; - esac
\ No newline at end of file + esac diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 8af94a4b..20e0e94e 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 e4f93858..00000000 --- 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" - ] |