diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2011-01-11 18:15:24 -0800 |
|---|---|---|
| committer | Nathan Gass <gass@search.ch> | 2011-01-12 11:35:44 +0100 |
| commit | 046c9c7d3b1c928b003497e05038e1cdaee85e50 (patch) | |
| tree | 91d7086073b4bfc1d6ec425bd6be17da1572db0b /tests/test-pandoc.hs | |
| parent | 51d9d8b674ea21c821113ec2bf92bb5e8a1cf067 (diff) | |
| download | pandoc-046c9c7d3b1c928b003497e05038e1cdaee85e50.tar.gz | |
test-pandoc: Relocated --columns=80 to just where it's needed.
We only need it for certain table tests, because of the relative
alignments.
Diffstat (limited to 'tests/test-pandoc.hs')
| -rw-r--r-- | tests/test-pandoc.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-pandoc.hs b/tests/test-pandoc.hs index 9773966b6..ad581307b 100644 --- a/tests/test-pandoc.hs +++ b/tests/test-pandoc.hs @@ -45,7 +45,7 @@ tests :: [Test] tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ lhsWriterTests "markdown") , testGroup "reader" [ test "basic" ["-r", "markdown", "-w", "native", "-s", "-S"] "testsuite.txt" "testsuite.native" - , test "tables" ["-r", "markdown", "-w", "native"] + , test "tables" ["-r", "markdown", "-w", "native", "--columns=80"] "tables.txt" "tables.native" , test "more" ["-r", "markdown", "-w", "native", "-S"] "markdown-reader-more.txt" "markdown-reader-more.native" @@ -54,9 +54,9 @@ tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ l , testGroup "citations" markdownCitationTests ] , testGroup "rst" [ testGroup "writer" (writerTests "rst" ++ lhsWriterTests "rst") - , testGroup "reader" [ test "basic" ["-r", "rst", "-w", "native", "-s", "-S"] + , testGroup "reader" [ test "basic" ["-r", "rst", "-w", "native", "-s", "-S", "--columns=80"] "rst-reader.rst" "rst-reader.native" - , test "tables" ["-r", "rst", "-w", "native"] + , test "tables" ["-r", "rst", "-w", "native", "--columns=80"] "tables.rst" "tables-rstsubset.native" , lhsReaderTest "rst+lhs" ] @@ -173,7 +173,7 @@ testWithNormalize normalizer testname opts inp norm = testCase testname $ do (outputPath, hOut) <- openTempFile "" "pandoc-test" let inpPath = inp let normPath = norm - ph <- runProcess pandocPath (["--columns=80"] ++ [inpPath] ++ ["--data-dir", ".."] ++ opts) Nothing + ph <- runProcess pandocPath ([inpPath] ++ ["--data-dir", ".."] ++ opts) Nothing (Just [("LANG","en_US.UTF-8"),("HOME", "./")]) Nothing (Just hOut) (Just stderr) ec <- waitForProcess ph result <- if ec == ExitSuccess |