Skip to content

Commit

Permalink
stack.yaml file, doctest upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed Jul 17, 2015
1 parent 31daf6e commit 52f892c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
7 changes: 4 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-2.9
resolver: lts-2.17
packages:
- ./wai
- ./wai-extra
Expand All @@ -12,5 +12,6 @@ packages:
- ./mime-types
- ./auto-update
extra-deps:
- fast-logger-2.3.1
- wai-logger-2.2.4
- doctest-0.10.1
- http2-1.0.2
- hex-0.1.2
16 changes: 1 addition & 15 deletions warp/test/doctests.hs
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
module Main where

import Test.DocTest
import System.Environment (getEnvironment)

main :: IO ()
main = do
env <- getEnvironment
let dist =
case lookup "HASKELL_DIST_DIR" env of
Nothing -> "dist"
Just x -> x
doctest
[ concat ["-i", dist, "/build/autogen/"]
, "-optP-include"
, concat ["-optP", dist, "/build/autogen/cabal_macros.h"]
, "Network/Wai/Handler/Warp.hs"
]
main = doctest ["Network"]
2 changes: 1 addition & 1 deletion warp/warp.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Test-Suite doctest
Ghc-Options: -threaded -Wall
Main-Is: doctests.hs
Build-Depends: base
, doctest >= 0.9.3
, doctest >= 0.10.1

Test-Suite spec
Main-Is: Spec.hs
Expand Down

0 comments on commit 52f892c

Please sign in to comment.