diff options
| -rw-r--r-- | benchmark/benchmark-pandoc.hs | 9 | ||||
| -rw-r--r-- | pandoc.cabal | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs index 941a1523d..b44f72053 100644 --- a/benchmark/benchmark-pandoc.hs +++ b/benchmark/benchmark-pandoc.hs @@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import Text.Pandoc import Criterion.Main import Criterion.Monad -import System.Environment (getArgs) +import Criterion.Types (Config(..)) import Data.Monoid import Data.Maybe (mapMaybe) import Debug.Trace (trace) @@ -44,9 +44,6 @@ writerBench doc (name, writer) = bench (name ++ " writer") $ nf main :: IO () main = do - args <- getArgs - (conf,_) <- parseArgs defaultConfig{ cfgSamples = Last $ Just 20 } - defaultOptions args inp <- readFile "tests/testsuite.txt" let opts = def{ readerSmart = True } let doc = handleError $ readMarkdown opts inp @@ -56,5 +53,5 @@ main = do let writers' = [(n,w) | (n, PureStringWriter w) <- writers] let writerBs = map (writerBench doc) $ writers' - defaultMainWith conf (return ()) $ - writerBs ++ readerBs + defaultMainWith defaultConfig{ timeLimit = 6.0 } + (writerBs ++ readerBs) diff --git a/pandoc.cabal b/pandoc.cabal index 1f85d203d..3818d0bf4 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -500,6 +500,6 @@ benchmark benchmark-pandoc Build-Depends: pandoc, base >= 4.2 && < 5, syb >= 0.1 && < 0.7, - criterion >= 0.5 && < 1.2 + criterion >= 1.0 && < 1.2 Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind Default-Language: Haskell98 |