on master help sign in
adding RunSpec.
commitc78a3dea7b1297ac282fc713f1f57f04a3cf4e2c authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 15 Aug 2012, 11:06 (14 years ago) parent1f2b19a
2 files changed+23−5
warp/test/main.hs → warp/test/RunSpec.hs+5−2 warp/warp.cabal+18−3
warp/test/main.hs → warp/test/RunSpec.hsrenamed+5−2
@@ -1,4 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
2+
3+module RunSpec where
4+
25import Network.Wai
36import Network.Wai.Handler.Warp
47import qualified Data.IORef as I
@@ -115,8 +118,8 @@ singleGet = "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n"
115118singlePostHello :: ByteString
116119singlePostHello = "POST /hello HTTP/1.1\r\nHost: localhost\r\nContent-length: 5\r\n\r\nHello"
117120
118−main :: IO ()
119−main = hspec $ do
121+spec :: Spec
122+spec = do
120123 describe "non-pipelining" $ do
121124 it "no body, read" $ runTest 5 readBody $ replicate 5 singleGet
122125 it "no body, ignore" $ runTest 5 ignoreBody $ replicate 5 singleGet
warp/warp.cabal+18−3
@@ -16,6 +16,9 @@ Extra-Source-Files: test/main.hs
1616Flag network-bytestring
1717 Default: False
1818
19+Flag test
20+ Default: False
21+
1922Library
2023 Build-Depends: base >= 3 && < 5
2124 , blaze-builder >= 0.2.1.4 && < 0.4
@@ -37,8 +40,20 @@ Library
3740 , network-bytestring >= 0.1.3 && < 0.1.4
3841 else
3942 Build-Depends: network >= 2.3 && < 2.4
40− Exposed-modules: Network.Wai.Handler.Warp
41− Other-modules: Network.Wai.Handler.Warp.Conduit
43+ if flag(test)
44+ Exposed-modules: Network.Wai.Handler.Warp
45+ Network.Wai.Handler.Warp.Conduit
46+ Network.Wai.Handler.Warp.ReadInt
47+ Network.Wai.Handler.Warp.Request
48+ Network.Wai.Handler.Warp.Response
49+ Network.Wai.Handler.Warp.Run
50+ Network.Wai.Handler.Warp.Settings
51+ Network.Wai.Handler.Warp.Timeout
52+ Network.Wai.Handler.Warp.Types
53+ Paths_warp
54+ else
55+ Exposed-modules: Network.Wai.Handler.Warp
56+ Other-modules: Network.Wai.Handler.Warp.Conduit
4257 Network.Wai.Handler.Warp.ReadInt
4358 Network.Wai.Handler.Warp.Request
4459 Network.Wai.Handler.Warp.Response
@@ -53,7 +68,7 @@ Library
5368
5469Test-Suite spec
5570 Main-Is: Spec.hs
56− Hs-Source-Dirs: test, .
71+ Hs-Source-Dirs: test
5772 Type: exitcode-stdio-1.0
5873
5974 Ghc-Options: -Wall