c414a08 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Integrated benchmark into cabal.

c414a08John MacFarlane14 years ago

Benchmark.hs → benchmark/benchmark-pandoc.hsrenamed+2−2

compare with master

unifiedsplit

@@ -3,7 +3,6 @@ import Text.Pandoc.Shared (readDataFile, normalize)

3import Criterion.Main

4import Data.List (isSuffixOf)

5import Text.JSON.Generic

6−import Data.Default

8readerBench :: Pandoc

7readerBench :: Pandoc

9 -> (String, ReaderOptions -> String -> Pandoc)

8 -> (String, ReaderOptions -> String -> Pandoc)

@@ -42,5 +41,6 @@ main = do

42 let doc = readMarkdown opts inp

41 let doc = readMarkdown opts inp

43 let readerBs = map (readerBench doc) readers

42 let readerBs = map (readerBench doc) readers

44 let writers' = [(n,w) | (n, PureStringWriter w) <- writers]

43 let writers' = [(n,w) | (n, PureStringWriter w) <- writers]

44+ defaultMain $

45− defaultMain $ map (writerBench doc) writers' ++ readerBs ++ normalizeBench doc

45+ map (writerBench doc) writers' ++ readerBs ++ normalizeBench doc

pandoc.cabal+19−2

@@ -96,8 +96,6 @@ Extra-Source-Files:

96 -- generated man pages (produced post-build)

97 man/man1/pandoc.1,

98 man/man5/pandoc_markdown.5,

99− -- benchmarks

100− Benchmark.hs,

101 -- tests

99 -- tests

102 tests/bodybg.gif,

100 tests/bodybg.gif,

103 tests/docbook-reader.docbook

101 tests/docbook-reader.docbook

@@ -427,3 +425,22 @@ Executable test-pandoc

427 Default-Language: Haskell98

425 Default-Language: Haskell98

428 Default-Extensions: CPP, TemplateHaskell, QuasiQuotes

426 Default-Extensions: CPP, TemplateHaskell, QuasiQuotes

429

427

428+benchmark benchmark-pandoc

429+ Type: exitcode-stdio-1.0

430+ Main-Is: benchmark-pandoc.hs

431+ Hs-Source-Dirs: benchmark

432+ if impl(ghc >= 6.10)

433+ Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

434+ else

435+ Build-depends: base >= 3 && < 4

436+ Build-Depends: pandoc,

437+ criterion >= 0.5 && < 0.7,

438+ json >= 0.4 && < 0.6

439+ if impl(ghc >= 7.0.1)

440+ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output

441+ else

442+ if impl(ghc >= 6.12)

443+ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output

444+ else

445+ Ghc-Options: -O2 -Wall

446+ Default-Language: Haskell98