diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:31:03 -0800 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:43:47 -0800 |
commit | 357b965b4455422cfdeb2676befda31d017f944f (patch) | |
tree | 732d4ad686a0bacd2b50b60dc947aba7d84a020c /tests/RunTests.hs | |
parent | bea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff) | |
parent | 38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff) | |
download | pandoc-357b965b4455422cfdeb2676befda31d017f944f.tar.gz |
Merge branch 'citeproc' into master.
Conflicts:
src/Text/Pandoc/Definition.hs
Diffstat (limited to 'tests/RunTests.hs')
-rw-r--r-- | tests/RunTests.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/RunTests.hs b/tests/RunTests.hs index 76f51c4f9..b56b492ae 100644 --- a/tests/RunTests.hs +++ b/tests/RunTests.hs @@ -109,6 +109,7 @@ main = do "textile-reader.textile" "textile-reader.native" r11 <- runTest "native reader" ["-r", "native", "-w", "native", "-s"] "testsuite.native" "testsuite.native" + r14s <- mapM (\style -> runTest ("markdown reader (citations) (" ++ style ++ ")") ["-r", "markdown", "-w", "markdown", "--bibliography", "biblio.bib", "--csl", style ++ ".csl", "--no-wrap"] "markdown-citations.txt" ("markdown-citations." ++ style ++ ".txt")) ["chicago-author-date","ieee","mhra"] r12s <- if runLhsTests then mapM runLhsWriterTest lhsWriterFormats else putStrLn "Skipping lhs writer tests because they presuppose highlighting support" >> return [] @@ -116,6 +117,7 @@ main = do then mapM runLhsReaderTest lhsReaderFormats else putStrLn "Skipping lhs reader tests because they presuppose highlighting support" >> return [] let results = r1s ++ + [ r2, r3, r4, r5 -- S5 , r6, r7, r7a -- markdown reader , r8, r8a -- rst @@ -123,7 +125,7 @@ main = do , r10 -- latex , rTextile1 -- textile , r11 -- native - ] ++ r12s ++ r13s + ] ++ r12s ++ r13s ++ r14s if all id results then do putStrLn "\nAll tests passed." @@ -169,7 +171,8 @@ runTest testname opts inp norm = do let normPath = norm hFlush stdout -- Note: COLUMNS must be set for markdown table reader - ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing (Just [("COLUMNS", "80")]) Nothing (Just hOut) (Just stderr) + ph <- runProcess pandocPath (opts ++ [inpPath] ++ ["--data-dir", ".."]) Nothing + (Just [("LANG","en_US.UTF-8"),("COLUMNS", "80"),("HOME", "./")]) Nothing (Just hOut) (Just stderr) ec <- waitForProcess ph result <- if ec == ExitSuccess then do |