git.iko.soy/typeable/pandoc
on master help sign in
Propagate (DY)LD_LIBRARY_PATH in tests (#6376)
commitc04800305e97a42d2d346fc6b0425817056438b7 authorLila <lila91142@gmail.com> dateTue 19 May 2020, 07:46 (6 years ago) parentf4185fc
2 files changed+14−9
compare with master
unifiedsplit
test/Tests/Command.hs+7−5 test/Tests/Old.hs+7−4
test/Tests/Command.hs+7−5
@@ -17,8 +17,10 @@ import Prelude
1717import Data.Algorithm.Diff
1818import qualified Data.ByteString as BS
1919import qualified Data.Text as T
20−import Data.List (isSuffixOf)
20+import Data.List (isSuffixOf, intercalate)
21+import Data.Maybe (catMaybes)
2122import System.Directory
23+import qualified System.Environment as Env
2224import System.Exit
2325import System.FilePath (joinPath, splitDirectories, takeDirectory, (</>))
2426import System.IO (hPutStr, stderr)
@@ -38,15 +40,15 @@ runTest :: String -- ^ Title of test
3840 -> String -- ^ Expected output
3941 -> TestTree
4042runTest testname pandocpath cmd inp norm = testCase testname $ do
43+ mldpath <- Env.lookupEnv "LD_LIBRARY_PATH"
44+ mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH"
4145 let findDynlibDir [] = Nothing
4246 findDynlibDir ("build":xs) = Just $ joinPath (reverse xs) </> "build"
4347 findDynlibDir (_:xs) = findDynlibDir xs
4448 let mbDynlibDir = findDynlibDir (reverse $ splitDirectories $
4549 takeDirectory $ takeWhile (/=' ') cmd)
46− let dynlibEnv = case mbDynlibDir of
47− Nothing -> []
48− Just d -> [("DYLD_LIBRARY_PATH", d),
49− ("LD_LIBRARY_PATH", d)]
50+ let dynlibEnv = [("DYLD_LIBRARY_PATH", intercalate ":" $ catMaybes [mbDynlibDir, mdyldpath])
51+ ,("LD_LIBRARY_PATH", intercalate ":" $ catMaybes [mbDynlibDir, mldpath])]
5052 let env' = dynlibEnv ++ [("PATH",takeDirectory pandocpath),("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./"),("pandoc_datadir", "..")]
5153 let pr = (shell cmd){ env = Just env' }
5254 (ec, out', err') <- readCreateProcessWithExitCode pr inp
test/Tests/Old.hs+7−4
@@ -15,8 +15,11 @@ module Tests.Old (tests) where
1515import Prelude
1616import Data.Algorithm.Diff
1717import Prelude hiding (readFile)
18+import Data.List (intercalate)
19+import Data.Maybe (catMaybes)
1820import System.Exit
1921import System.FilePath (joinPath, splitDirectories, (<.>), (</>))
22+import qualified System.Environment as Env
2023import Text.Pandoc.Process (pipeProcess)
2124import Test.Tasty (TestTree, testGroup)
2225import Test.Tasty.Golden.Advanced (goldenTest)
@@ -298,12 +301,12 @@ testWithNormalize normalizer pandocPath testname opts inp norm =
298301 (compareValues norm options) updateGolden
299302 where getExpected = normalizer <$> readFile' norm
300303 getActual = do
304+ mldpath <- Env.lookupEnv "LD_LIBRARY_PATH"
305+ mdyldpath <- Env.lookupEnv "DYLD_LIBRARY_PATH"
301306 let mbDynlibDir = findDynlibDir (reverse $
302307 splitDirectories pandocPath)
303− let dynlibEnv = case mbDynlibDir of
304− Nothing -> []
305− Just d -> [("DYLD_LIBRARY_PATH", d),
306− ("LD_LIBRARY_PATH", d)]
308+ let dynlibEnv = [("DYLD_LIBRARY_PATH", intercalate ":" $ catMaybes [mbDynlibDir, mdyldpath])
309+ ,("LD_LIBRARY_PATH", intercalate ":" $ catMaybes [mbDynlibDir, mldpath])]
307310 let env = dynlibEnv ++
308311 [("TMP","."),("LANG","en_US.UTF-8"),("HOME", "./")]
309312 (ec, out) <- pipeProcess (Just env) pandocPath options mempty