diff options
| -rw-r--r-- | test/Tests/Command.hs | 3 | ||||
| -rw-r--r-- | test/Tests/Old.hs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/Tests/Command.hs b/test/Tests/Command.hs index 59b04eac1..dc0e25dbe 100644 --- a/test/Tests/Command.hs +++ b/test/Tests/Command.hs @@ -40,11 +40,12 @@ execTest :: String -- ^ Path to test executable execTest testExePath cmd inp = do mldpath <- Env.lookupEnv "LD_LIBRARY_PATH" mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH" + mpdd <- Env.lookupEnv "pandoc_datadir" let env' = ("PATH",takeDirectory testExePath) : ("TMP",".") : ("LANG","en_US.UTF-8") : ("HOME", "./") : - ("pandoc_datadir", "..") : + maybe [] ((:[]) . ("pandoc_datadir",)) mpdd ++ maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++ maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath let pr = (shell (pandocToEmulate True cmd)){ env = Just env' } diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs index 160086be2..e890bad0b 100644 --- a/test/Tests/Old.hs +++ b/test/Tests/Old.hs @@ -321,9 +321,11 @@ testWithNormalize normalizer pandocPath testname opts inp norm = getActual = do mldpath <- Env.lookupEnv "LD_LIBRARY_PATH" mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH" + mpdd <- Env.lookupEnv "pandoc_datadir" let env = ("TMP",".") : ("LANG","en_US.UTF-8") : ("HOME", "./") : + maybe [] ((:[]) . ("pandoc_datadir",)) mpdd ++ maybe [] ((:[]) . ("LD_LIBRARY_PATH",)) mldpath ++ maybe [] ((:[]) . ("DYLD_LIBRARY_PATH",)) mdyldpath @@ -335,7 +337,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 . T.pack - options = ["--data-dir=../data","--quiet"] ++ [inp] ++ opts + options = ["--quiet"] ++ [inp] ++ opts compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String) compareValues norm options expected actual = do |