From 70ebccf93b415ba804efdfbff3694d3d33875613 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 9 Oct 2015 16:01:08 -0700
Subject: Updated benchmark program.

---
 benchmark/benchmark-pandoc.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'benchmark')

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)
-- 
cgit v1.2.3