2ca1b20 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Fix finding of data files from test programs.

2ca1b20John MacFarlane6 years ago

test/Tests/Command.hs+2−1

compare with master

unifiedsplit

@@ -40,11 +40,12 @@ execTest :: String -- ^ Path to test executable

40execTest testExePath cmd inp = do

41 mldpath <- Env.lookupEnv "LD_LIBRARY_PATH"

42 mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH"

43+ mpdd <- Env.lookupEnv "pandoc_datadir"

43 let env' = ("PATH",takeDirectory testExePath) :

44 let env' = ("PATH",takeDirectory testExePath) :

44 ("TMP",".") :

45 ("TMP",".") :

45 ("LANG","en_US.UTF-8") :

46 ("LANG","en_US.UTF-8") :

46 ("HOME", "./") :

47 ("HOME", "./") :

47− ("pandoc_datadir", "..") :

48+ maybe [] ((:[]) . ("pandoc_datadir",)) mpdd ++

48 maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++

49 maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++

49 maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath

50 maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath

50 let pr = (shell (pandocToEmulate True cmd)){ env = Just env' }

51 let pr = (shell (pandocToEmulate True cmd)){ env = Just env' }

test/Tests/Old.hs+3−1

@@ -321,9 +321,11 @@ testWithNormalize normalizer pandocPath testname opts inp norm =

321 getActual = do

322 mldpath <- Env.lookupEnv "LD_LIBRARY_PATH"

323 mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH"

324+ mpdd <- Env.lookupEnv "pandoc_datadir"

324 let env = ("TMP",".") :

325 let env = ("TMP",".") :

325 ("LANG","en_US.UTF-8") :

326 ("LANG","en_US.UTF-8") :

326 ("HOME", "./") :

327 ("HOME", "./") :

328+ maybe [] ((:[]) . ("pandoc_datadir",)) mpdd ++

327 maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++

329 maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++

328 maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath

330 maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath

329

331

@@ -335,7 +337,7 @@ testWithNormalize normalizer pandocPath testname opts inp norm =

335 -- filter \r so the tests will work on Windows machines

337 -- filter \r so the tests will work on Windows machines

336 else fail $ "Pandoc failed with error code " ++ show ec

338 else fail $ "Pandoc failed with error code " ++ show ec

337 updateGolden = UTF8.writeFile norm . T.pack

339 updateGolden = UTF8.writeFile norm . T.pack

338− options = ["--data-dir=../data","--quiet"] ++ [inp] ++ opts

340+ options = ["--quiet"] ++ [inp] ++ opts

339

341

340compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String)

342compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String)

341compareValues norm options expected actual = do

343compareValues norm options expected actual = do