diff options
author | John MacFarlane <jgm@berkeley.edu> | 2017-08-14 13:02:34 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2017-08-14 13:03:26 -0700 |
commit | 38578ad06cca916cefebe11066622b7e60f305e8 (patch) | |
tree | cad667468407fa2b32b48301d59cc935ddd708fe /test/Tests/Old.hs | |
parent | ceda566a5ef1f1ae07ecdc7883702190d3cf1406 (diff) | |
download | pandoc-38578ad06cca916cefebe11066622b7e60f305e8.tar.gz |
Test fixes so we can find data files.
In old tests & command tests, we now set the environment variable
pandoc_datadir.
In lua tests, we set the datadir explicitly.
Diffstat (limited to 'test/Tests/Old.hs')
-rw-r--r-- | test/Tests/Old.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/Tests/Old.hs b/test/Tests/Old.hs index c4dd4d322..27bb20b4b 100644 --- a/test/Tests/Old.hs +++ b/test/Tests/Old.hs @@ -238,7 +238,8 @@ testWithNormalize normalizer testname opts inp norm = Just d -> [("DYLD_LIBRARY_PATH", d), ("LD_LIBRARY_PATH", d)] let env = dynlibEnv ++ - [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./")] + [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./"), + ("pandoc_datadir","..")] ph <- runProcess pandocPath options Nothing (Just env) Nothing (Just hOut) (Just hErr) ec <- waitForProcess ph @@ -253,7 +254,7 @@ testWithNormalize normalizer testname opts inp norm = then "" else '\n':errcontents updateGolden = UTF8.writeFile norm - options = ["--quiet", "--data-dir", ".." </> "data"] ++ [inp] ++ opts + options = ["--quiet"] ++ [inp] ++ opts compareValues :: FilePath -> [String] -> String -> String -> IO (Maybe String) compareValues norm options expected actual = do |