on master help sign in
Merge pull request #551 from RyanGlScott/master

Make warp benchmarks build with modern criterion

commit7eded0855ea50dda4f3944f3d7ececb384b7eda3 authorMichael Snoyman <michael@snoyman.com> dateWed 18 May 2016, 18:05 (10 years ago) parent1694dd41b56728
2 files changed+18−7
warp/bench/Parser.hs+6−6 warp/warp.cabal+12−1
warp/bench/Parser.hs+6−6
@@ -32,15 +32,15 @@ main = do
3232 defaultMain [
3333 bgroup "requestLine1" [
3434 bench "parseRequestLine3" $ whnf parseRequestLine3 requestLine1
35− , bench "parseRequestLine2" $ parseRequestLine2 requestLine1
36− , bench "parseRequestLine1" $ parseRequestLine1 requestLine1
37− , bench "parseRequestLine0" $ parseRequestLine0 requestLine1
35+ , bench "parseRequestLine2" $ whnfIO $ parseRequestLine2 requestLine1
36+ , bench "parseRequestLine1" $ whnfIO $ parseRequestLine1 requestLine1
37+ , bench "parseRequestLine0" $ whnfIO $ parseRequestLine0 requestLine1
3838 ]
3939 , bgroup "requestLine2" [
4040 bench "parseRequestLine3" $ whnf parseRequestLine3 requestLine2
41− , bench "parseRequestLine2" $ parseRequestLine2 requestLine2
42− , bench "parseRequestLine1" $ parseRequestLine1 requestLine2
43− , bench "parseRequestLine0" $ parseRequestLine0 requestLine2
41+ , bench "parseRequestLine2" $ whnfIO $ parseRequestLine2 requestLine2
42+ , bench "parseRequestLine1" $ whnfIO $ parseRequestLine1 requestLine2
43+ , bench "parseRequestLine0" $ whnfIO $ parseRequestLine0 requestLine2
4444 ]
4545 ]
4646
warp/warp.cabal+12−1
@@ -185,11 +185,22 @@ Benchmark parser
185185 Main-Is: Parser.hs
186186 HS-Source-Dirs: bench .
187187 Build-Depends: base
188+ , auto-update
188189 , bytestring
189− , criterion
190+ , containers
191+ , criterion >= 1
192+ , hashable
193+ , http-date
190194 , http-types
191195 , network
192196 , network
197+ , unix-compat
198+
199+ if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
200+ Cpp-Options: -DSENDFILEFD
201+ Build-Depends: unix
202+ if os(windows)
203+ Cpp-Options: -DWINDOWS
193204
194205Source-Repository head
195206 Type: git