diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-12-31 14:09:41 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-12-31 14:09:41 -0400 |
commit | cbb7f306b8f8f2672ea34b040a0010739f722310 (patch) | |
tree | a1818bf7bab9e240a0a8dbca947e65e7062322d9 /Test.hs | |
parent | c7c745d28868c8cd646d3e31dd8ba6a0b763f611 (diff) |
Revert "git-annex.cabal: Add back custom-setup stanza, so cabal new-build works."
This reverts commit c7c745d28868c8cd646d3e31dd8ba6a0b763f611.
No, still doesn't work when built with cabal. It did with stack; stack
must somehow make the unix package implicitly available.
With cabal, System.Posix.Process and System.Posix.Env are both missing.
Diffstat (limited to 'Test.hs')
-rw-r--r-- | Test.hs | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -83,7 +83,6 @@ import qualified Utility.Process import qualified Utility.Misc import qualified Utility.InodeCache import qualified Utility.Env -import qualified Utility.Env.Set import qualified Utility.Matcher import qualified Utility.Exception import qualified Utility.Hash @@ -131,7 +130,7 @@ runner = Just go subenv = "GIT_ANNEX_TEST_SUBPROCESS" runsubprocesstests opts Nothing = do pp <- Annex.Path.programPath - Utility.Env.Set.setEnv subenv "1" True + Utility.Env.setEnv subenv "1" True ps <- getArgs (Nothing, Nothing, Nothing, pid) <-createProcess (proc pp ps) exitcode <- waitForProcess pid @@ -1920,9 +1919,9 @@ ensuretmpdir = do isolateGitConfig :: IO a -> IO a isolateGitConfig a = Utility.Tmp.withTmpDir "testhome" $ \tmphome -> do tmphomeabs <- absPath tmphome - Utility.Env.Set.setEnv "HOME" tmphomeabs True - Utility.Env.Set.setEnv "XDG_CONFIG_HOME" tmphomeabs True - Utility.Env.Set.setEnv "GIT_CONFIG_NOSYSTEM" "1" True + Utility.Env.setEnv "HOME" tmphomeabs True + Utility.Env.setEnv "XDG_CONFIG_HOME" tmphomeabs True + Utility.Env.setEnv "GIT_CONFIG_NOSYSTEM" "1" True a cleanup :: FilePath -> IO () @@ -2108,7 +2107,7 @@ setTestMode testmode = do currdir <- getCurrentDirectory p <- Utility.Env.getEnvDefault "PATH" "" - mapM_ (\(var, val) -> Utility.Env.Set.setEnv var val True) + mapM_ (\(var, val) -> Utility.Env.setEnv var val True) -- Ensure that the just-built git annex is used. [ ("PATH", currdir ++ [searchPathSeparator] ++ p) , ("TOPDIR", currdir) |