Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Tests.Old: specify --data-dir=../data.

Browse source 
Remove old pandoc_datadir environment variable, which
doesn't do anything.
This commit is contained in:
John MacFarlane 2019-03-13 17:44:07 -07:00
parent bbe2da390e
commit 5b385d2e66
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/Tests/Old.hs
View file

@ -290,8 +290,7 @@ testWithNormalize normalizer pandocPath testname opts inp norm =
Just d -> [("DYLD_LIBRARY_PATH", d), Just d -> [("DYLD_LIBRARY_PATH", d),
("LD_LIBRARY_PATH", d)] ("LD_LIBRARY_PATH", d)]
let env = dynlibEnv ++ let env = dynlibEnv ++
[("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./"), [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./")]
("pandoc_datadir","..")]
(ec, out) <- pipeProcess (Just env) pandocPath options mempty (ec, out) <- pipeProcess (Just env) pandocPath options mempty
if ec == ExitSuccess if ec == ExitSuccess
then return $ filter (/='\r') . normalizer 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 -- filter \r so the tests will work on Windows machines
else fail $ "Pandoc failed with error code " ++ show ec else fail $ "Pandoc failed with error code " ++ show ec
updateGolden = UTF8.writeFile norm updateGolden = UTF8.writeFile norm
options = ["--quiet"] ++ [inp] ++ opts options = ["--data-dir=../data","--quiet"] ++ [inp] ++ opts
compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String) compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String)
compareValues norm options expected actual = do compareValues norm options expected actual = do