aboutsummaryrefslogtreecommitdiff
path: root/test/Tests
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2019-03-13 17:44:07 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2019-03-13 17:44:07 -0700
commit5b385d2e66aa2baff0413002e9eb41ca18740c70 (patch)
tree750aa9fcedf70963c51f9b134bd3484933b1be52 /test/Tests
parentbbe2da390e5ec49ce6c88e00ba5f1c7f2b4c7c80 (diff)
downloadpandoc-5b385d2e66aa2baff0413002e9eb41ca18740c70.tar.gz
Tests.Old: specify --data-dir=../data.
Remove old pandoc_datadir environment variable, which doesn't do anything.
Diffstat (limited to 'test/Tests')
-rw-r--r--test/Tests/Old.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs
index ea82bc1b5..a7cea48b4 100644
--- a/test/Tests/Old.hs
+++ b/test/Tests/Old.hs
@@ -290,8 +290,7 @@ testWithNormalize normalizer pandocPath testname opts inp norm =
Just d -> [("DYLD_LIBRARY_PATH", d),
("LD_LIBRARY_PATH", d)]
let env = dynlibEnv ++
- [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./"),
- ("pandoc_datadir","..")]
+ [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./")]
(ec, out) <- pipeProcess (Just env) pandocPath options mempty
if ec == ExitSuccess
then return $ filter (/='\r') . normalizer
@@ -299,7 +298,7 @@ testWithNormalize normalizer pandocPath testname opts inp norm =
-- filter \r so the tests will work on Windows machines
else fail $ "Pandoc failed with error code " ++ show ec
updateGolden = UTF8.writeFile norm
- options = ["--quiet"] ++ [inp] ++ opts
+ options = ["--data-dir=../data","--quiet"] ++ [inp] ++ opts
compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String)
compareValues norm options expected actual = do