git.iko.soy/typeable/pandoc
on master help sign in
Tests: avoid calling findPandoc multiple times.
commit7c424b315cb814b952d9bd9d5f027beb70169bff authorJohn MacFarlane <jgm@berkeley.edu> dateThu 31 Jan 2019, 20:56 (8 years ago) parentfdf7f07
3 files changed+207−194
test/Tests/Command.hs+3−4 test/Tests/Old.hs+199−186 test/test-pandoc.hs+5−4
test/Tests/Command.hs+3−4
@@ -53,13 +53,12 @@ runTest testname pandocpath cmd inp norm = testCase testname $ do
5353 return $ TestError ec
5454 assertBool (show result) (result == TestPassed)
5555
56−tests :: TestTree
56+tests :: FilePath -> TestTree
5757{-# NOINLINE tests #-}
58−tests = unsafePerformIO $ do
59− pandocpath <- findPandoc
58+tests pandocPath = unsafePerformIO $ do
6059 files <- filter (".md" `isSuffixOf`) <$>
6160 getDirectoryContents "command"
62− let cmds = map (extractCommandTest pandocpath) files
61+ let cmds = map (extractCommandTest pandocPath) files
6362 return $ testGroup "Command:" cmds
6463
6564isCodeBlock :: Block -> Bool
test/Tests/Old.hs+199−186
@@ -12,214 +12,226 @@ import Test.Tasty.Golden.Advanced (goldenTest)
1212import Tests.Helpers hiding (test)
1313import qualified Text.Pandoc.UTF8 as UTF8
1414
15−tests :: [TestTree]
16−tests = [ testGroup "markdown"
17− [ testGroup "writer"
18− $ writerTests "markdown" ++ lhsWriterTests "markdown"
19− , testGroup "reader"
20− [ test "basic" ["-r", "markdown", "-w", "native", "-s"]
21− "testsuite.txt" "testsuite.native"
22− , test "tables" ["-r", "markdown", "-w", "native", "--columns=80"]
23− "tables.txt" "tables.native"
24− , test "pipe tables" ["-r", "markdown", "-w", "native", "--columns=80"]
25− "pipe-tables.txt" "pipe-tables.native"
26− , test "more" ["-r", "markdown", "-w", "native", "-s"]
27− "markdown-reader-more.txt" "markdown-reader-more.native"
28− , lhsReaderTest "markdown+lhs"
29− ]
30− , testGroup "citations"
31− [ test "citations" ["-r", "markdown", "-w", "native"]
32− "markdown-citations.txt" "markdown-citations.native"
33− ]
34− ]
35− , testGroup "rst"
36− [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst")
37− , testGroup "reader"
38− [ test "basic" ["-r", "rst+smart", "-w", "native",
39− "-s", "--columns=80"] "rst-reader.rst" "rst-reader.native"
40− , test "tables" ["-r", "rst", "-w", "native", "--columns=80"]
41− "tables.rst" "tables-rstsubset.native"
42− , lhsReaderTest "rst+lhs"
43− ]
44− ]
45− , testGroup "latex"
46− [ testGroup "writer" (writerTests "latex" ++ lhsWriterTests "latex")
47− , testGroup "reader"
48− [ test "basic" ["-r", "latex+raw_tex", "-w", "native", "-s"]
49− "latex-reader.latex" "latex-reader.native"
50− , lhsReaderTest "latex+lhs"
51− ]
52− ]
53− , testGroup "html"
54− [ testGroup "writer" (writerTests "html4" ++ writerTests "html5" ++
55− lhsWriterTests "html")
56− , test "reader" ["-r", "html", "-w", "native", "-s"]
57− "html-reader.html" "html-reader.native"
58− ]
59− , testGroup "s5"
60− [ s5WriterTest "basic" ["-s"] "s5"
61− , s5WriterTest "fancy" ["-s","--mathjax","-i"] "s5"
62− , s5WriterTest "fragment" [] "html4"
63− , s5WriterTest "inserts" ["-s", "-H", "insert",
64− "-B", "insert", "-A", "insert", "-c", "main.css"] "html4"
65− ]
66− , testGroup "textile"
67− [ testGroup "writer" $ writerTests "textile"
68− , test "reader" ["-r", "textile", "-w", "native", "-s"]
69− "textile-reader.textile" "textile-reader.native"
70− ]
71− , testGroup "docbook"
72− [ testGroup "writer" $ writerTests "docbook4"
73− , test "reader" ["-r", "docbook", "-w", "native", "-s"]
74− "docbook-reader.docbook" "docbook-reader.native"
75− , test "reader" ["-r", "docbook", "-w", "native", "-s"]
76− "docbook-xref.docbook" "docbook-xref.native"
77− ]
78− , testGroup "docbook5"
79− [ testGroup "writer" $ writerTests "docbook5"
80− ]
81− , testGroup "jats"
82− [ testGroup "writer" $ writerTests "jats"
83− , test "reader" ["-r", "jats", "-w", "native", "-s"]
84− "jats-reader.xml" "jats-reader.native"
85− ]
86− , testGroup "native"
87− [ testGroup "writer" $ writerTests "native"
88− , test "reader" ["-r", "native", "-w", "native", "-s"]
89− "testsuite.native" "testsuite.native"
90− ]
91− , testGroup "fb2"
92− [ fb2WriterTest "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
93− , fb2WriterTest "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
94− , fb2WriterTest "images" [] "fb2/images.markdown" "fb2/images.fb2"
95− , fb2WriterTest "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
96− , fb2WriterTest "math" [] "fb2/math.markdown" "fb2/math.fb2"
97− , fb2WriterTest "meta" [] "fb2/meta.markdown" "fb2/meta.fb2"
98− , fb2WriterTest "tables" [] "tables.native" "tables.fb2"
99− , fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2"
100− ]
101− , testGroup "mediawiki"
102− [ testGroup "writer" $ writerTests "mediawiki"
103− , test "reader" ["-r", "mediawiki", "-w", "native", "-s"]
104− "mediawiki-reader.wiki" "mediawiki-reader.native"
105− ]
106− , testGroup "vimwiki"
107− [ test "reader" ["-r", "vimwiki", "-w", "native", "-s"]
108− "vimwiki-reader.wiki" "vimwiki-reader.native"
109− ]
110− , testGroup "dokuwiki"
111− [ testGroup "writer" $ writerTests "dokuwiki"
112− , test "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
113− "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
114− , test "multiblock table" ["-r", "native", "-w", "dokuwiki", "-s"]
115− "dokuwiki_multiblock_table.native" "dokuwiki_multiblock_table.dokuwiki"
116− , test "external images" ["-r", "native", "-w", "dokuwiki", "-s"]
117− "dokuwiki_external_images.native" "dokuwiki_external_images.dokuwiki"
118− ]
119− , testGroup "opml"
120− [ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
121− "testsuite.native" "writer.opml"
122− , test "reader" ["-r", "opml", "-w", "native", "-s"]
123− "opml-reader.opml" "opml-reader.native"
124− ]
125− , testGroup "haddock"
126− [ testGroup "writer" $ writerTests "haddock"
127− , test "reader" ["-r", "haddock", "-w", "native", "-s"]
128− "haddock-reader.haddock" "haddock-reader.native"
129− ]
130− , testGroup "txt2tags"
131− [ test "reader" ["-r", "t2t", "-w", "native", "-s"]
132− "txt2tags.t2t" "txt2tags.native" ]
133− , testGroup "epub" [
134− test "features" ["-r", "epub", "-w", "native"]
135− "epub/features.epub" "epub/features.native"
136− , test "wasteland" ["-r", "epub", "-w", "native"]
137− "epub/wasteland.epub" "epub/wasteland.native"
138− , test "formatting" ["-r", "epub", "-w", "native"]
139− "epub/formatting.epub" "epub/formatting.native"
140− ]
141− , testGroup "twiki"
142− [ test "reader" ["-r", "twiki", "-w", "native", "-s"]
143− "twiki-reader.twiki" "twiki-reader.native" ]
144− , testGroup "tikiwiki"
145− [ test "reader" ["-r", "tikiwiki", "-w", "native", "-s"]
146− "tikiwiki-reader.tikiwiki" "tikiwiki-reader.native" ]
147− , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
148− [ "opendocument" , "context" , "texinfo", "icml", "tei"
149− , "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
150− ]
151− , testGroup "writers-lang-and-dir"
152− [ test "latex" ["-f", "native", "-t", "latex", "-s"]
153− "writers-lang-and-dir.native" "writers-lang-and-dir.latex"
154− , test "context" ["-f", "native", "-t", "context", "-s"]
155− "writers-lang-and-dir.native" "writers-lang-and-dir.context"
156− ]
157− , testGroup "muse"
158− [ testGroup "writer" $ writerTests "muse"
159− ]
160− , testGroup "ms"
161− [ testGroup "writer" $ writerTests "ms"
162− ]
163− , testGroup "creole"
164− [ test "reader" ["-r", "creole", "-w", "native", "-s"]
165− "creole-reader.txt" "creole-reader.native"
166− ]
167− , testGroup "custom writer"
168− [ test "basic" ["-f", "native", "-t", "../data/sample.lua"]
169− "testsuite.native" "writer.custom"
170− , test "tables" ["-f", "native", "-t", "../data/sample.lua"]
171− "tables.native" "tables.custom"
172− ]
173− , testGroup "man"
174− [ test "reader" ["-r", "man", "-w", "native", "-s"]
175− "man-reader.man" "man-reader.native"
176− ]
177− , testGroup "org"
178− [ test "reader" ["-r", "org", "-w", "native", "-s"]
179− "org-select-tags.org" "org-select-tags.native"
180− ]
181− ]
15+tests :: FilePath -> [TestTree]
16+tests pandocPath =
17+ [ testGroup "markdown"
18+ [ testGroup "writer"
19+ $ writerTests' "markdown" ++ lhsWriterTests' "markdown"
20+ , testGroup "reader"
21+ [ test' "basic" ["-r", "markdown", "-w", "native", "-s"]
22+ "testsuite.txt" "testsuite.native"
23+ , test' "tables" ["-r", "markdown", "-w", "native", "--columns=80"]
24+ "tables.txt" "tables.native"
25+ , test' "pipe tables" ["-r", "markdown", "-w", "native", "--columns=80"]
26+ "pipe-tables.txt" "pipe-tables.native"
27+ , test' "more" ["-r", "markdown", "-w", "native", "-s"]
28+ "markdown-reader-more.txt" "markdown-reader-more.native"
29+ , lhsReaderTest' "markdown+lhs"
30+ ]
31+ , testGroup "citations"
32+ [ test' "citations" ["-r", "markdown", "-w", "native"]
33+ "markdown-citations.txt" "markdown-citations.native"
34+ ]
35+ ]
36+ , testGroup "rst"
37+ [ testGroup "writer" (writerTests' "rst" ++ lhsWriterTests' "rst")
38+ , testGroup "reader"
39+ [ test' "basic" ["-r", "rst+smart", "-w", "native",
40+ "-s", "--columns=80"] "rst-reader.rst" "rst-reader.native"
41+ , test' "tables" ["-r", "rst", "-w", "native", "--columns=80"]
42+ "tables.rst" "tables-rstsubset.native"
43+ , lhsReaderTest' "rst+lhs"
44+ ]
45+ ]
46+ , testGroup "latex"
47+ [ testGroup "writer"
48+ (writerTests' "latex" ++ lhsWriterTests' "latex")
49+ , testGroup "reader"
50+ [ test' "basic" ["-r", "latex+raw_tex", "-w", "native", "-s"]
51+ "latex-reader.latex" "latex-reader.native"
52+ , lhsReaderTest' "latex+lhs"
53+ ]
54+ ]
55+ , testGroup "html"
56+ [ testGroup "writer" (writerTests' "html4" ++ writerTests' "html5" ++
57+ lhsWriterTests' "html")
58+ , test' "reader" ["-r", "html", "-w", "native", "-s"]
59+ "html-reader.html" "html-reader.native"
60+ ]
61+ , testGroup "s5"
62+ [ s5WriterTest' "basic" ["-s"] "s5"
63+ , s5WriterTest' "fancy" ["-s","--mathjax","-i"] "s5"
64+ , s5WriterTest' "fragment" [] "html4"
65+ , s5WriterTest' "inserts" ["-s", "-H", "insert",
66+ "-B", "insert", "-A", "insert", "-c", "main.css"] "html4"
67+ ]
68+ , testGroup "textile"
69+ [ testGroup "writer" $ writerTests' "textile"
70+ , test' "reader" ["-r", "textile", "-w", "native", "-s"]
71+ "textile-reader.textile" "textile-reader.native"
72+ ]
73+ , testGroup "docbook"
74+ [ testGroup "writer" $ writerTests' "docbook4"
75+ , test' "reader" ["-r", "docbook", "-w", "native", "-s"]
76+ "docbook-reader.docbook" "docbook-reader.native"
77+ , test' "reader" ["-r", "docbook", "-w", "native", "-s"]
78+ "docbook-xref.docbook" "docbook-xref.native"
79+ ]
80+ , testGroup "docbook5"
81+ [ testGroup "writer" $ writerTests' "docbook5"
82+ ]
83+ , testGroup "jats"
84+ [ testGroup "writer" $ writerTests' "jats"
85+ , test' "reader" ["-r", "jats", "-w", "native", "-s"]
86+ "jats-reader.xml" "jats-reader.native"
87+ ]
88+ , testGroup "native"
89+ [ testGroup "writer" $ writerTests' "native"
90+ , test' "reader" ["-r", "native", "-w", "native", "-s"]
91+ "testsuite.native" "testsuite.native"
92+ ]
93+ , testGroup "fb2"
94+ [ fb2WriterTest' "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
95+ , fb2WriterTest' "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
96+ , fb2WriterTest' "images" [] "fb2/images.markdown" "fb2/images.fb2"
97+ , fb2WriterTest' "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
98+ , fb2WriterTest' "math" [] "fb2/math.markdown" "fb2/math.fb2"
99+ , fb2WriterTest' "meta" [] "fb2/meta.markdown" "fb2/meta.fb2"
100+ , fb2WriterTest' "tables" [] "tables.native" "tables.fb2"
101+ , fb2WriterTest' "testsuite" [] "testsuite.native" "writer.fb2"
102+ ]
103+ , testGroup "mediawiki"
104+ [ testGroup "writer" $ writerTests' "mediawiki"
105+ , test' "reader" ["-r", "mediawiki", "-w", "native", "-s"]
106+ "mediawiki-reader.wiki" "mediawiki-reader.native"
107+ ]
108+ , testGroup "vimwiki"
109+ [ test' "reader" ["-r", "vimwiki", "-w", "native", "-s"]
110+ "vimwiki-reader.wiki" "vimwiki-reader.native"
111+ ]
112+ , testGroup "dokuwiki"
113+ [ testGroup "writer" $ writerTests' "dokuwiki"
114+ , test' "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
115+ "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
116+ , test' "multiblock table" ["-r", "native", "-w", "dokuwiki", "-s"]
117+ "dokuwiki_multiblock_table.native" "dokuwiki_multiblock_table.dokuwiki"
118+ , test' "external images" ["-r", "native", "-w", "dokuwiki", "-s"]
119+ "dokuwiki_external_images.native" "dokuwiki_external_images.dokuwiki"
120+ ]
121+ , testGroup "opml"
122+ [ test' "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
123+ "testsuite.native" "writer.opml"
124+ , test' "reader" ["-r", "opml", "-w", "native", "-s"]
125+ "opml-reader.opml" "opml-reader.native"
126+ ]
127+ , testGroup "haddock"
128+ [ testGroup "writer" $ writerTests' "haddock"
129+ , test' "reader" ["-r", "haddock", "-w", "native", "-s"]
130+ "haddock-reader.haddock" "haddock-reader.native"
131+ ]
132+ , testGroup "txt2tags"
133+ [ test' "reader" ["-r", "t2t", "-w", "native", "-s"]
134+ "txt2tags.t2t" "txt2tags.native" ]
135+ , testGroup "epub" [
136+ test' "features" ["-r", "epub", "-w", "native"]
137+ "epub/features.epub" "epub/features.native"
138+ , test' "wasteland" ["-r", "epub", "-w", "native"]
139+ "epub/wasteland.epub" "epub/wasteland.native"
140+ , test' "formatting" ["-r", "epub", "-w", "native"]
141+ "epub/formatting.epub" "epub/formatting.native"
142+ ]
143+ , testGroup "twiki"
144+ [ test' "reader" ["-r", "twiki", "-w", "native", "-s"]
145+ "twiki-reader.twiki" "twiki-reader.native" ]
146+ , testGroup "tikiwiki"
147+ [ test' "reader" ["-r", "tikiwiki", "-w", "native", "-s"]
148+ "tikiwiki-reader.tikiwiki" "tikiwiki-reader.native" ]
149+ , testGroup "other writers" $ map (\f -> testGroup f $ writerTests' f)
150+ [ "opendocument" , "context" , "texinfo", "icml", "tei"
151+ , "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
152+ ]
153+ , testGroup "writers-lang-and-dir"
154+ [ test' "latex" ["-f", "native", "-t", "latex", "-s"]
155+ "writers-lang-and-dir.native" "writers-lang-and-dir.latex"
156+ , test' "context" ["-f", "native", "-t", "context", "-s"]
157+ "writers-lang-and-dir.native" "writers-lang-and-dir.context"
158+ ]
159+ , testGroup "muse"
160+ [ testGroup "writer" $ writerTests' "muse"
161+ ]
162+ , testGroup "ms"
163+ [ testGroup "writer" $ writerTests' "ms"
164+ ]
165+ , testGroup "creole"
166+ [ test' "reader" ["-r", "creole", "-w", "native", "-s"]
167+ "creole-reader.txt" "creole-reader.native"
168+ ]
169+ , testGroup "custom writer"
170+ [ test' "basic" ["-f", "native", "-t", "../data/sample.lua"]
171+ "testsuite.native" "writer.custom"
172+ , test' "tables" ["-f", "native", "-t", "../data/sample.lua"]
173+ "tables.native" "tables.custom"
174+ ]
175+ , testGroup "man"
176+ [ test' "reader" ["-r", "man", "-w", "native", "-s"]
177+ "man-reader.man" "man-reader.native"
178+ ]
179+ , testGroup "org"
180+ [ test' "reader" ["-r", "org", "-w", "native", "-s"]
181+ "org-select-tags.org" "org-select-tags.native"
182+ ]
183+ ]
184+ where
185+ test' = test pandocPath
186+ writerTests' = writerTests pandocPath
187+ s5WriterTest' = s5WriterTest pandocPath
188+ fb2WriterTest' = fb2WriterTest pandocPath
189+ lhsWriterTests' = lhsWriterTests pandocPath
190+ lhsReaderTest' = lhsReaderTest pandocPath
182191
183192-- makes sure file is fully closed after reading
184193readFile' :: FilePath -> IO String
185194readFile' f = do s <- UTF8.readFile f
186195 return $! (length s `seq` s)
187196
188−lhsWriterTests :: String -> [TestTree]
189−lhsWriterTests format
197+lhsWriterTests :: FilePath -> String -> [TestTree]
198+lhsWriterTests pandocPath format
190199 = [ t "lhs to normal" format
191200 , t "lhs to lhs" (format ++ "+lhs")
192201 ]
193202 where
194− t n f = test n ["--wrap=preserve", "-r", "native", "-s", "-w", f]
203+ t n f = test pandocPath
204+ n ["--wrap=preserve", "-r", "native", "-s", "-w", f]
195205 "lhs-test.native" ("lhs-test" <.> f)
196206
197−lhsReaderTest :: String -> TestTree
198−lhsReaderTest format =
199− test "lhs" ["-r", format, "-w", "native"]
207+lhsReaderTest :: FilePath -> String -> TestTree
208+lhsReaderTest pandocPath format =
209+ test pandocPath "lhs" ["-r", format, "-w", "native"]
200210 ("lhs-test" <.> format) norm
201211 where norm = if format == "markdown+lhs"
202212 then "lhs-test-markdown.native"
203213 else "lhs-test.native"
204214
205−writerTests :: String -> [TestTree]
206−writerTests format
207− = [ test "basic" (opts ++ ["-s"]) "testsuite.native" ("writer" <.> format)
208− , test "tables" opts "tables.native" ("tables" <.> format)
215+writerTests :: FilePath -> String -> [TestTree]
216+writerTests pandocPath format
217+ = [ test pandocPath
218+ "basic" (opts ++ ["-s"]) "testsuite.native" ("writer" <.> format)
219+ , test pandocPath
220+ "tables" opts "tables.native" ("tables" <.> format)
209221 ]
210222 where
211223 opts = ["-r", "native", "-w", format, "--columns=78",
212224 "--variable", "pandoc-version="]
213225
214−s5WriterTest :: String -> [String] -> String -> TestTree
215−s5WriterTest modifier opts format
216− = test (format ++ " writer (" ++ modifier ++ ")")
226+s5WriterTest :: FilePath -> String -> [String] -> String -> TestTree
227+s5WriterTest pandocPath modifier opts format
228+ = test pandocPath (format ++ " writer (" ++ modifier ++ ")")
217229 (["-r", "native", "-w", format] ++ opts)
218230 "s5.native" ("s5-" ++ modifier <.> "html")
219231
220−fb2WriterTest :: String -> [String] -> String -> String -> TestTree
221−fb2WriterTest title opts inputfile normfile =
222− testWithNormalize (ignoreBinary . formatXML)
232+fb2WriterTest :: FilePath -> String -> [String] -> String -> String -> TestTree
233+fb2WriterTest pandocPath title opts inputfile normfile =
234+ testWithNormalize (ignoreBinary . formatXML) pandocPath
223235 title (["-t", "fb2"]++opts) inputfile normfile
224236 where
225237 formatXML xml = splitTags $ zip xml (drop 1 xml)
@@ -231,7 +243,8 @@ fb2WriterTest title opts inputfile normfile =
231243 startsWith tag str = all (uncurry (==)) $ zip tag str
232244
233245-- | Run a test without normalize function, return True if test passed.
234−test :: String -- ^ Title of test
246+test :: FilePath -- ^ Path of pandoc executable
247+ -> String -- ^ Title of test
235248 -> [String] -- ^ Options to pass to pandoc
236249 -> String -- ^ Input filepath
237250 -> FilePath -- ^ Norm (for test results) filepath
@@ -240,17 +253,17 @@ test = testWithNormalize id
240253
241254-- | Run a test with normalize function, return True if test passed.
242255testWithNormalize :: (String -> String) -- ^ Normalize function for output
256+ -> FilePath -- ^ Path to pandoc executable
243257 -> String -- ^ Title of test
244258 -> [String] -- ^ Options to pass to pandoc
245259 -> String -- ^ Input filepath
246260 -> FilePath -- ^ Norm (for test results) filepath
247261 -> TestTree
248−testWithNormalize normalizer testname opts inp norm =
262+testWithNormalize normalizer pandocPath testname opts inp norm =
249263 goldenTest testname getExpected getActual
250264 (compareValues norm options) updateGolden
251265 where getExpected = normalizer <$> readFile' norm
252266 getActual = do
253− pandocPath <- findPandoc
254267 let mbDynlibDir = findDynlibDir (reverse $
255268 splitDirectories pandocPath)
256269 let dynlibEnv = case mbDynlibDir of
test/test-pandoc.hs+5−4
@@ -44,9 +44,10 @@ import qualified Tests.Writers.TEI
4444import Tests.Helpers (findPandoc)
4545import Text.Pandoc.Shared (inDirectory)
4646
47−tests :: TestTree
48−tests = testGroup "pandoc tests" [ Tests.Command.tests
49− , testGroup "Old" Tests.Old.tests
47+tests :: FilePath -> TestTree
48+tests pandocPath = testGroup "pandoc tests"
49+ [ Tests.Command.tests pandocPath
50+ , testGroup "Old" (Tests.Old.tests pandocPath)
5051 , testGroup "Shared" Tests.Shared.tests
5152 , testGroup "Writers"
5253 [ testGroup "Native" Tests.Writers.Native.tests
@@ -92,4 +93,4 @@ main = do
9293 inDirectory "test" $ do
9394 fp <- findPandoc
9495 putStrLn $ "Using pandoc executable at " ++ fp
95− defaultMain tests
96+ defaultMain $ tests fp