aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2019-01-31 20:56:20 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2019-01-31 20:56:20 -0800
commit7c424b315cb814b952d9bd9d5f027beb70169bff (patch)
tree95fc61980e1588da792832fa3d40c8f0d04863b5 /test
parentfdf7f07f6269238dacae7dc90068f64d4666367e (diff)
downloadpandoc-7c424b315cb814b952d9bd9d5f027beb70169bff.tar.gz
Tests: avoid calling findPandoc multiple times.
Diffstat (limited to 'test')
-rw-r--r--test/Tests/Command.hs7
-rw-r--r--test/Tests/Old.hs385
-rw-r--r--test/test-pandoc.hs9
3 files changed, 207 insertions, 194 deletions
diff --git a/test/Tests/Command.hs b/test/Tests/Command.hs
index 89ea9a741..eeb43604a 100644
--- a/test/Tests/Command.hs
+++ b/test/Tests/Command.hs
@@ -53,13 +53,12 @@ runTest testname pandocpath cmd inp norm = testCase testname $ do
return $ TestError ec
assertBool (show result) (result == TestPassed)
-tests :: TestTree
+tests :: FilePath -> TestTree
{-# NOINLINE tests #-}
-tests = unsafePerformIO $ do
- pandocpath <- findPandoc
+tests pandocPath = unsafePerformIO $ do
files <- filter (".md" `isSuffixOf`) <$>
getDirectoryContents "command"
- let cmds = map (extractCommandTest pandocpath) files
+ let cmds = map (extractCommandTest pandocPath) files
return $ testGroup "Command:" cmds
isCodeBlock :: Block -> Bool
diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs
index de8c6bf6a..b9757d1da 100644
--- a/test/Tests/Old.hs
+++ b/test/Tests/Old.hs
@@ -12,214 +12,226 @@ import Test.Tasty.Golden.Advanced (goldenTest)
import Tests.Helpers hiding (test)
import qualified Text.Pandoc.UTF8 as UTF8
-tests :: [TestTree]
-tests = [ testGroup "markdown"
- [ testGroup "writer"
- $ writerTests "markdown" ++ lhsWriterTests "markdown"
- , testGroup "reader"
- [ test "basic" ["-r", "markdown", "-w", "native", "-s"]
- "testsuite.txt" "testsuite.native"
- , test "tables" ["-r", "markdown", "-w", "native", "--columns=80"]
- "tables.txt" "tables.native"
- , test "pipe tables" ["-r", "markdown", "-w", "native", "--columns=80"]
- "pipe-tables.txt" "pipe-tables.native"
- , test "more" ["-r", "markdown", "-w", "native", "-s"]
- "markdown-reader-more.txt" "markdown-reader-more.native"
- , lhsReaderTest "markdown+lhs"
- ]
- , testGroup "citations"
- [ test "citations" ["-r", "markdown", "-w", "native"]
- "markdown-citations.txt" "markdown-citations.native"
- ]
- ]
- , testGroup "rst"
- [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst")
- , testGroup "reader"
- [ test "basic" ["-r", "rst+smart", "-w", "native",
- "-s", "--columns=80"] "rst-reader.rst" "rst-reader.native"
- , test "tables" ["-r", "rst", "-w", "native", "--columns=80"]
- "tables.rst" "tables-rstsubset.native"
- , lhsReaderTest "rst+lhs"
- ]
- ]
- , testGroup "latex"
- [ testGroup "writer" (writerTests "latex" ++ lhsWriterTests "latex")
- , testGroup "reader"
- [ test "basic" ["-r", "latex+raw_tex", "-w", "native", "-s"]
- "latex-reader.latex" "latex-reader.native"
- , lhsReaderTest "latex+lhs"
- ]
- ]
- , testGroup "html"
- [ testGroup "writer" (writerTests "html4" ++ writerTests "html5" ++
- lhsWriterTests "html")
- , test "reader" ["-r", "html", "-w", "native", "-s"]
- "html-reader.html" "html-reader.native"
- ]
- , testGroup "s5"
- [ s5WriterTest "basic" ["-s"] "s5"
- , s5WriterTest "fancy" ["-s","--mathjax","-i"] "s5"
- , s5WriterTest "fragment" [] "html4"
- , s5WriterTest "inserts" ["-s", "-H", "insert",
- "-B", "insert", "-A", "insert", "-c", "main.css"] "html4"
- ]
- , testGroup "textile"
- [ testGroup "writer" $ writerTests "textile"
- , test "reader" ["-r", "textile", "-w", "native", "-s"]
- "textile-reader.textile" "textile-reader.native"
- ]
- , testGroup "docbook"
- [ testGroup "writer" $ writerTests "docbook4"
- , test "reader" ["-r", "docbook", "-w", "native", "-s"]
- "docbook-reader.docbook" "docbook-reader.native"
- , test "reader" ["-r", "docbook", "-w", "native", "-s"]
- "docbook-xref.docbook" "docbook-xref.native"
- ]
- , testGroup "docbook5"
- [ testGroup "writer" $ writerTests "docbook5"
- ]
- , testGroup "jats"
- [ testGroup "writer" $ writerTests "jats"
- , test "reader" ["-r", "jats", "-w", "native", "-s"]
- "jats-reader.xml" "jats-reader.native"
- ]
- , testGroup "native"
- [ testGroup "writer" $ writerTests "native"
- , test "reader" ["-r", "native", "-w", "native", "-s"]
- "testsuite.native" "testsuite.native"
- ]
- , testGroup "fb2"
- [ fb2WriterTest "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
- , fb2WriterTest "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
- , fb2WriterTest "images" [] "fb2/images.markdown" "fb2/images.fb2"
- , fb2WriterTest "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
- , fb2WriterTest "math" [] "fb2/math.markdown" "fb2/math.fb2"
- , fb2WriterTest "meta" [] "fb2/meta.markdown" "fb2/meta.fb2"
- , fb2WriterTest "tables" [] "tables.native" "tables.fb2"
- , fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2"
- ]
- , testGroup "mediawiki"
- [ testGroup "writer" $ writerTests "mediawiki"
- , test "reader" ["-r", "mediawiki", "-w", "native", "-s"]
- "mediawiki-reader.wiki" "mediawiki-reader.native"
- ]
- , testGroup "vimwiki"
- [ test "reader" ["-r", "vimwiki", "-w", "native", "-s"]
- "vimwiki-reader.wiki" "vimwiki-reader.native"
- ]
- , testGroup "dokuwiki"
- [ testGroup "writer" $ writerTests "dokuwiki"
- , test "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
- "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
- , test "multiblock table" ["-r", "native", "-w", "dokuwiki", "-s"]
- "dokuwiki_multiblock_table.native" "dokuwiki_multiblock_table.dokuwiki"
- , test "external images" ["-r", "native", "-w", "dokuwiki", "-s"]
- "dokuwiki_external_images.native" "dokuwiki_external_images.dokuwiki"
- ]
- , testGroup "opml"
- [ test "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
- "testsuite.native" "writer.opml"
- , test "reader" ["-r", "opml", "-w", "native", "-s"]
- "opml-reader.opml" "opml-reader.native"
- ]
- , testGroup "haddock"
- [ testGroup "writer" $ writerTests "haddock"
- , test "reader" ["-r", "haddock", "-w", "native", "-s"]
- "haddock-reader.haddock" "haddock-reader.native"
- ]
- , testGroup "txt2tags"
- [ test "reader" ["-r", "t2t", "-w", "native", "-s"]
- "txt2tags.t2t" "txt2tags.native" ]
- , testGroup "epub" [
- test "features" ["-r", "epub", "-w", "native"]
- "epub/features.epub" "epub/features.native"
- , test "wasteland" ["-r", "epub", "-w", "native"]
- "epub/wasteland.epub" "epub/wasteland.native"
- , test "formatting" ["-r", "epub", "-w", "native"]
- "epub/formatting.epub" "epub/formatting.native"
- ]
- , testGroup "twiki"
- [ test "reader" ["-r", "twiki", "-w", "native", "-s"]
- "twiki-reader.twiki" "twiki-reader.native" ]
- , testGroup "tikiwiki"
- [ test "reader" ["-r", "tikiwiki", "-w", "native", "-s"]
- "tikiwiki-reader.tikiwiki" "tikiwiki-reader.native" ]
- , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
- [ "opendocument" , "context" , "texinfo", "icml", "tei"
- , "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
- ]
- , testGroup "writers-lang-and-dir"
- [ test "latex" ["-f", "native", "-t", "latex", "-s"]
- "writers-lang-and-dir.native" "writers-lang-and-dir.latex"
- , test "context" ["-f", "native", "-t", "context", "-s"]
- "writers-lang-and-dir.native" "writers-lang-and-dir.context"
- ]
- , testGroup "muse"
- [ testGroup "writer" $ writerTests "muse"
- ]
- , testGroup "ms"
- [ testGroup "writer" $ writerTests "ms"
- ]
- , testGroup "creole"
- [ test "reader" ["-r", "creole", "-w", "native", "-s"]
- "creole-reader.txt" "creole-reader.native"
- ]
- , testGroup "custom writer"
- [ test "basic" ["-f", "native", "-t", "../data/sample.lua"]
- "testsuite.native" "writer.custom"
- , test "tables" ["-f", "native", "-t", "../data/sample.lua"]
- "tables.native" "tables.custom"
- ]
- , testGroup "man"
- [ test "reader" ["-r", "man", "-w", "native", "-s"]
- "man-reader.man" "man-reader.native"
- ]
- , testGroup "org"
- [ test "reader" ["-r", "org", "-w", "native", "-s"]
- "org-select-tags.org" "org-select-tags.native"
- ]
- ]
+tests :: FilePath -> [TestTree]
+tests pandocPath =
+ [ testGroup "markdown"
+ [ testGroup "writer"
+ $ writerTests' "markdown" ++ lhsWriterTests' "markdown"
+ , testGroup "reader"
+ [ test' "basic" ["-r", "markdown", "-w", "native", "-s"]
+ "testsuite.txt" "testsuite.native"
+ , test' "tables" ["-r", "markdown", "-w", "native", "--columns=80"]
+ "tables.txt" "tables.native"
+ , test' "pipe tables" ["-r", "markdown", "-w", "native", "--columns=80"]
+ "pipe-tables.txt" "pipe-tables.native"
+ , test' "more" ["-r", "markdown", "-w", "native", "-s"]
+ "markdown-reader-more.txt" "markdown-reader-more.native"
+ , lhsReaderTest' "markdown+lhs"
+ ]
+ , testGroup "citations"
+ [ test' "citations" ["-r", "markdown", "-w", "native"]
+ "markdown-citations.txt" "markdown-citations.native"
+ ]
+ ]
+ , testGroup "rst"
+ [ testGroup "writer" (writerTests' "rst" ++ lhsWriterTests' "rst")
+ , testGroup "reader"
+ [ test' "basic" ["-r", "rst+smart", "-w", "native",
+ "-s", "--columns=80"] "rst-reader.rst" "rst-reader.native"
+ , test' "tables" ["-r", "rst", "-w", "native", "--columns=80"]
+ "tables.rst" "tables-rstsubset.native"
+ , lhsReaderTest' "rst+lhs"
+ ]
+ ]
+ , testGroup "latex"
+ [ testGroup "writer"
+ (writerTests' "latex" ++ lhsWriterTests' "latex")
+ , testGroup "reader"
+ [ test' "basic" ["-r", "latex+raw_tex", "-w", "native", "-s"]
+ "latex-reader.latex" "latex-reader.native"
+ , lhsReaderTest' "latex+lhs"
+ ]
+ ]
+ , testGroup "html"
+ [ testGroup "writer" (writerTests' "html4" ++ writerTests' "html5" ++
+ lhsWriterTests' "html")
+ , test' "reader" ["-r", "html", "-w", "native", "-s"]
+ "html-reader.html" "html-reader.native"
+ ]
+ , testGroup "s5"
+ [ s5WriterTest' "basic" ["-s"] "s5"
+ , s5WriterTest' "fancy" ["-s","--mathjax","-i"] "s5"
+ , s5WriterTest' "fragment" [] "html4"
+ , s5WriterTest' "inserts" ["-s", "-H", "insert",
+ "-B", "insert", "-A", "insert", "-c", "main.css"] "html4"
+ ]
+ , testGroup "textile"
+ [ testGroup "writer" $ writerTests' "textile"
+ , test' "reader" ["-r", "textile", "-w", "native", "-s"]
+ "textile-reader.textile" "textile-reader.native"
+ ]
+ , testGroup "docbook"
+ [ testGroup "writer" $ writerTests' "docbook4"
+ , test' "reader" ["-r", "docbook", "-w", "native", "-s"]
+ "docbook-reader.docbook" "docbook-reader.native"
+ , test' "reader" ["-r", "docbook", "-w", "native", "-s"]
+ "docbook-xref.docbook" "docbook-xref.native"
+ ]
+ , testGroup "docbook5"
+ [ testGroup "writer" $ writerTests' "docbook5"
+ ]
+ , testGroup "jats"
+ [ testGroup "writer" $ writerTests' "jats"
+ , test' "reader" ["-r", "jats", "-w", "native", "-s"]
+ "jats-reader.xml" "jats-reader.native"
+ ]
+ , testGroup "native"
+ [ testGroup "writer" $ writerTests' "native"
+ , test' "reader" ["-r", "native", "-w", "native", "-s"]
+ "testsuite.native" "testsuite.native"
+ ]
+ , testGroup "fb2"
+ [ fb2WriterTest' "basic" [] "fb2/basic.markdown" "fb2/basic.fb2"
+ , fb2WriterTest' "titles" [] "fb2/titles.markdown" "fb2/titles.fb2"
+ , fb2WriterTest' "images" [] "fb2/images.markdown" "fb2/images.fb2"
+ , fb2WriterTest' "images-embedded" [] "fb2/images-embedded.html" "fb2/images-embedded.fb2"
+ , fb2WriterTest' "math" [] "fb2/math.markdown" "fb2/math.fb2"
+ , fb2WriterTest' "meta" [] "fb2/meta.markdown" "fb2/meta.fb2"
+ , fb2WriterTest' "tables" [] "tables.native" "tables.fb2"
+ , fb2WriterTest' "testsuite" [] "testsuite.native" "writer.fb2"
+ ]
+ , testGroup "mediawiki"
+ [ testGroup "writer" $ writerTests' "mediawiki"
+ , test' "reader" ["-r", "mediawiki", "-w", "native", "-s"]
+ "mediawiki-reader.wiki" "mediawiki-reader.native"
+ ]
+ , testGroup "vimwiki"
+ [ test' "reader" ["-r", "vimwiki", "-w", "native", "-s"]
+ "vimwiki-reader.wiki" "vimwiki-reader.native"
+ ]
+ , testGroup "dokuwiki"
+ [ testGroup "writer" $ writerTests' "dokuwiki"
+ , test' "inline_formatting" ["-r", "native", "-w", "dokuwiki", "-s"]
+ "dokuwiki_inline_formatting.native" "dokuwiki_inline_formatting.dokuwiki"
+ , test' "multiblock table" ["-r", "native", "-w", "dokuwiki", "-s"]
+ "dokuwiki_multiblock_table.native" "dokuwiki_multiblock_table.dokuwiki"
+ , test' "external images" ["-r", "native", "-w", "dokuwiki", "-s"]
+ "dokuwiki_external_images.native" "dokuwiki_external_images.dokuwiki"
+ ]
+ , testGroup "opml"
+ [ test' "basic" ["-r", "native", "-w", "opml", "--columns=78", "-s"]
+ "testsuite.native" "writer.opml"
+ , test' "reader" ["-r", "opml", "-w", "native", "-s"]
+ "opml-reader.opml" "opml-reader.native"
+ ]
+ , testGroup "haddock"
+ [ testGroup "writer" $ writerTests' "haddock"
+ , test' "reader" ["-r", "haddock", "-w", "native", "-s"]
+ "haddock-reader.haddock" "haddock-reader.native"
+ ]
+ , testGroup "txt2tags"
+ [ test' "reader" ["-r", "t2t", "-w", "native", "-s"]
+ "txt2tags.t2t" "txt2tags.native" ]
+ , testGroup "epub" [
+ test' "features" ["-r", "epub", "-w", "native"]
+ "epub/features.epub" "epub/features.native"
+ , test' "wasteland" ["-r", "epub", "-w", "native"]
+ "epub/wasteland.epub" "epub/wasteland.native"
+ , test' "formatting" ["-r", "epub", "-w", "native"]
+ "epub/formatting.epub" "epub/formatting.native"
+ ]
+ , testGroup "twiki"
+ [ test' "reader" ["-r", "twiki", "-w", "native", "-s"]
+ "twiki-reader.twiki" "twiki-reader.native" ]
+ , testGroup "tikiwiki"
+ [ test' "reader" ["-r", "tikiwiki", "-w", "native", "-s"]
+ "tikiwiki-reader.tikiwiki" "tikiwiki-reader.native" ]
+ , testGroup "other writers" $ map (\f -> testGroup f $ writerTests' f)
+ [ "opendocument" , "context" , "texinfo", "icml", "tei"
+ , "man" , "plain" , "rtf", "org", "asciidoc", "zimwiki"
+ ]
+ , testGroup "writers-lang-and-dir"
+ [ test' "latex" ["-f", "native", "-t", "latex", "-s"]
+ "writers-lang-and-dir.native" "writers-lang-and-dir.latex"
+ , test' "context" ["-f", "native", "-t", "context", "-s"]
+ "writers-lang-and-dir.native" "writers-lang-and-dir.context"
+ ]
+ , testGroup "muse"
+ [ testGroup "writer" $ writerTests' "muse"
+ ]
+ , testGroup "ms"
+ [ testGroup "writer" $ writerTests' "ms"
+ ]
+ , testGroup "creole"
+ [ test' "reader" ["-r", "creole", "-w", "native", "-s"]
+ "creole-reader.txt" "creole-reader.native"
+ ]
+ , testGroup "custom writer"
+ [ test' "basic" ["-f", "native", "-t", "../data/sample.lua"]
+ "testsuite.native" "writer.custom"
+ , test' "tables" ["-f", "native", "-t", "../data/sample.lua"]
+ "tables.native" "tables.custom"
+ ]
+ , testGroup "man"
+ [ test' "reader" ["-r", "man", "-w", "native", "-s"]
+ "man-reader.man" "man-reader.native"
+ ]
+ , testGroup "org"
+ [ test' "reader" ["-r", "org", "-w", "native", "-s"]
+ "org-select-tags.org" "org-select-tags.native"
+ ]
+ ]
+ where
+ test' = test pandocPath
+ writerTests' = writerTests pandocPath
+ s5WriterTest' = s5WriterTest pandocPath
+ fb2WriterTest' = fb2WriterTest pandocPath
+ lhsWriterTests' = lhsWriterTests pandocPath
+ lhsReaderTest' = lhsReaderTest pandocPath
-- makes sure file is fully closed after reading
readFile' :: FilePath -> IO String
readFile' f = do s <- UTF8.readFile f
return $! (length s `seq` s)
-lhsWriterTests :: String -> [TestTree]
-lhsWriterTests format
+lhsWriterTests :: FilePath -> String -> [TestTree]
+lhsWriterTests pandocPath format
= [ t "lhs to normal" format
, t "lhs to lhs" (format ++ "+lhs")
]
where
- t n f = test n ["--wrap=preserve", "-r", "native", "-s", "-w", f]
+ t n f = test pandocPath
+ n ["--wrap=preserve", "-r", "native", "-s", "-w", f]
"lhs-test.native" ("lhs-test" <.> f)
-lhsReaderTest :: String -> TestTree
-lhsReaderTest format =
- test "lhs" ["-r", format, "-w", "native"]
+lhsReaderTest :: FilePath -> String -> TestTree
+lhsReaderTest pandocPath format =
+ test pandocPath "lhs" ["-r", format, "-w", "native"]
("lhs-test" <.> format) norm
where norm = if format == "markdown+lhs"
then "lhs-test-markdown.native"
else "lhs-test.native"
-writerTests :: String -> [TestTree]
-writerTests format
- = [ test "basic" (opts ++ ["-s"]) "testsuite.native" ("writer" <.> format)
- , test "tables" opts "tables.native" ("tables" <.> format)
+writerTests :: FilePath -> String -> [TestTree]
+writerTests pandocPath format
+ = [ test pandocPath
+ "basic" (opts ++ ["-s"]) "testsuite.native" ("writer" <.> format)
+ , test pandocPath
+ "tables" opts "tables.native" ("tables" <.> format)
]
where
opts = ["-r", "native", "-w", format, "--columns=78",
"--variable", "pandoc-version="]
-s5WriterTest :: String -> [String] -> String -> TestTree
-s5WriterTest modifier opts format
- = test (format ++ " writer (" ++ modifier ++ ")")
+s5WriterTest :: FilePath -> String -> [String] -> String -> TestTree
+s5WriterTest pandocPath modifier opts format
+ = test pandocPath (format ++ " writer (" ++ modifier ++ ")")
(["-r", "native", "-w", format] ++ opts)
"s5.native" ("s5-" ++ modifier <.> "html")
-fb2WriterTest :: String -> [String] -> String -> String -> TestTree
-fb2WriterTest title opts inputfile normfile =
- testWithNormalize (ignoreBinary . formatXML)
+fb2WriterTest :: FilePath -> String -> [String] -> String -> String -> TestTree
+fb2WriterTest pandocPath title opts inputfile normfile =
+ testWithNormalize (ignoreBinary . formatXML) pandocPath
title (["-t", "fb2"]++opts) inputfile normfile
where
formatXML xml = splitTags $ zip xml (drop 1 xml)
@@ -231,7 +243,8 @@ fb2WriterTest title opts inputfile normfile =
startsWith tag str = all (uncurry (==)) $ zip tag str
-- | Run a test without normalize function, return True if test passed.
-test :: String -- ^ Title of test
+test :: FilePath -- ^ Path of pandoc executable
+ -> String -- ^ Title of test
-> [String] -- ^ Options to pass to pandoc
-> String -- ^ Input filepath
-> FilePath -- ^ Norm (for test results) filepath
@@ -240,17 +253,17 @@ test = testWithNormalize id
-- | Run a test with normalize function, return True if test passed.
testWithNormalize :: (String -> String) -- ^ Normalize function for output
+ -> FilePath -- ^ Path to pandoc executable
-> String -- ^ Title of test
-> [String] -- ^ Options to pass to pandoc
-> String -- ^ Input filepath
-> FilePath -- ^ Norm (for test results) filepath
-> TestTree
-testWithNormalize normalizer testname opts inp norm =
+testWithNormalize normalizer pandocPath testname opts inp norm =
goldenTest testname getExpected getActual
(compareValues norm options) updateGolden
where getExpected = normalizer <$> readFile' norm
getActual = do
- pandocPath <- findPandoc
let mbDynlibDir = findDynlibDir (reverse $
splitDirectories pandocPath)
let dynlibEnv = case mbDynlibDir of
diff --git a/test/test-pandoc.hs b/test/test-pandoc.hs
index 946a676e0..64f381021 100644
--- a/test/test-pandoc.hs
+++ b/test/test-pandoc.hs
@@ -44,9 +44,10 @@ import qualified Tests.Writers.TEI
import Tests.Helpers (findPandoc)
import Text.Pandoc.Shared (inDirectory)
-tests :: TestTree
-tests = testGroup "pandoc tests" [ Tests.Command.tests
- , testGroup "Old" Tests.Old.tests
+tests :: FilePath -> TestTree
+tests pandocPath = testGroup "pandoc tests"
+ [ Tests.Command.tests pandocPath
+ , testGroup "Old" (Tests.Old.tests pandocPath)
, testGroup "Shared" Tests.Shared.tests
, testGroup "Writers"
[ testGroup "Native" Tests.Writers.Native.tests
@@ -92,4 +93,4 @@ main = do
inDirectory "test" $ do
fp <- findPandoc
putStrLn $ "Using pandoc executable at " ++ fp
- defaultMain tests
+ defaultMain $ tests fp