aboutsummaryrefslogtreecommitdiff
path: root/tests/Tests
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-04 07:36:18 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-04 07:36:18 -0700
commit4630cff2a6c116f1d474f459e6e759f5ce7f2003 (patch)
tree5c52982b8f0615fadb69a0a105af9e1e60d51f25 /tests/Tests
parent81335df9a51740631e75614c1279634f937d650a (diff)
parentcd9a5d90cbf93925db5bb9e9060ef40d05b4bfc8 (diff)
downloadpandoc-4630cff2a6c116f1d474f459e6e759f5ce7f2003.tar.gz
Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend
Conflicts: pandoc.cabal
Diffstat (limited to 'tests/Tests')
-rw-r--r--tests/Tests/Old.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index 2216ccca7..9bcc37b57 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -144,7 +144,12 @@ tests = [ testGroup "markdown"
]
, testGroup "txt2tags"
[ test "reader" ["-r", "t2t", "-w", "native"]
- "txt2tags.t2t" "txt2tags.native"
+ "txt2tags.t2t" "txt2tags.native" ]
+ , testGroup "epub" [
+ test "features" ["-r", "epub", "-w", "native"]
+ "features.epub" "features.native"
+ , test "formatting" ["-r", "epub", "-w", "native"]
+ "formatting.epub" "formatting.native"
]
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
[ "opendocument" , "context" , "texinfo", "icml"