git.iko.soy/typeable/pandoc
on master help sign in
test-pandoc: Relocated --columns=80 to just where it's needed.
046c9c7John MacFarlane
tests/test-pandoc.hs+4−4
@@ -45,7 +45,7 @@ tests :: [Test]
45tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ lhsWriterTests "markdown")
45tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ lhsWriterTests "markdown")
46 , testGroup "reader" [ test "basic" ["-r", "markdown", "-w", "native", "-s", "-S"]
46 , testGroup "reader" [ test "basic" ["-r", "markdown", "-w", "native", "-s", "-S"]
47 "testsuite.txt" "testsuite.native"
47 "testsuite.txt" "testsuite.native"
48− , test "tables" ["-r", "markdown", "-w", "native"]
48+ , test "tables" ["-r", "markdown", "-w", "native", "--columns=80"]
49 "tables.txt" "tables.native"
49 "tables.txt" "tables.native"
50 , test "more" ["-r", "markdown", "-w", "native", "-S"]
50 , test "more" ["-r", "markdown", "-w", "native", "-S"]
51 "markdown-reader-more.txt" "markdown-reader-more.native"
51 "markdown-reader-more.txt" "markdown-reader-more.native"
@@ -54,9 +54,9 @@ tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ l
54 , testGroup "citations" markdownCitationTests
54 , testGroup "citations" markdownCitationTests
55 ]
55 ]
56 , testGroup "rst" [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst")
56 , testGroup "rst" [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst")
57− , testGroup "reader" [ test "basic" ["-r", "rst", "-w", "native", "-s", "-S"]
57+ , testGroup "reader" [ test "basic" ["-r", "rst", "-w", "native", "-s", "-S", "--columns=80"]
58 "rst-reader.rst" "rst-reader.native"
58 "rst-reader.rst" "rst-reader.native"
59− , test "tables" ["-r", "rst", "-w", "native"]
59+ , test "tables" ["-r", "rst", "-w", "native", "--columns=80"]
60 "tables.rst" "tables-rstsubset.native"
60 "tables.rst" "tables-rstsubset.native"
61 , lhsReaderTest "rst+lhs"
61 , lhsReaderTest "rst+lhs"
62 ]
62 ]
@@ -173,7 +173,7 @@ testWithNormalize normalizer testname opts inp norm = testCase testname $ do
173 (outputPath, hOut) <- openTempFile "" "pandoc-test"
173 (outputPath, hOut) <- openTempFile "" "pandoc-test"
174 let inpPath = inp
174 let inpPath = inp
175 let normPath = norm
175 let normPath = norm
176− ph <- runProcess pandocPath (["--columns=80"] ++ [inpPath] ++ ["--data-dir", ".."] ++ opts) Nothing
176+ ph <- runProcess pandocPath ([inpPath] ++ ["--data-dir", ".."] ++ opts) Nothing
177 (Just [("LANG","en_US.UTF-8"),("HOME", "./")]) Nothing (Just hOut) (Just stderr)
177 (Just [("LANG","en_US.UTF-8"),("HOME", "./")]) Nothing (Just hOut) (Just stderr)
178 ec <- waitForProcess ph
178 ec <- waitForProcess ph
179 result <- if ec == ExitSuccess
179 result <- if ec == ExitSuccess