From 984cfb680c8696c67244056a82139f10256c854d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 4 Mar 2014 03:01:31 -0400 Subject: fix environment propigation in windows test suite Let through HOME, etc when running git-annex from test suite. --- Test.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Test.hs') 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 -- cgit v1.2.3