summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-03-04 03:01:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-03-04 03:01:31 -0400
commit984cfb680c8696c67244056a82139f10256c854d (patch)
tree9ec69388ecf1e79371a161a31f9d4f12e7e94a27
parent49c9a0ab6bc8ced62ccd89f04faca6b6a9788c1c (diff)
fix environment propigation in windows test suite
Let through HOME, etc when running git-annex from test suite.
-rw-r--r--Test.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Test.hs b/Test.hs
index af44ade08..f9ab7ef3c 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1392,7 +1392,8 @@ prepareTestEnv forcedirect = do
cwd <- getCurrentDirectory
p <- Utility.Env.getEnvDefault "PATH" ""
- let env =
+ env <- Utility.Env.getEnvironment
+ let newenv =
-- Ensure that the just-built git annex is used.
[ ("PATH", cwd ++ [searchPathSeparator] ++ p)
, ("TOPDIR", cwd)
@@ -1408,7 +1409,7 @@ prepareTestEnv forcedirect = do
, ("FORCEDIRECT", if forcedirect then "1" else "")
]
- return $ M.fromList env
+ return $ M.fromList newenv `M.union` M.fromList env
changeToTmpDir :: TestEnv -> FilePath -> IO ()
changeToTmpDir env t = do