mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more win warning squashing

Browse source
This commit is contained in:
Joey Hess 2013-09-06 18:54:24 -04:00
parent 1fc5586b4e
commit 7ad39245e6
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Test.hs
View file

@ -56,13 +56,13 @@ import qualified Utility.Process
import qualified Utility.Misc import qualified Utility.Misc
import qualified Utility.InodeCache import qualified Utility.InodeCache
import qualified Utility.Env import qualified Utility.Env
import qualified Utility.Gpg
import qualified Utility.Matcher import qualified Utility.Matcher
import qualified Utility.Exception import qualified Utility.Exception
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import qualified GitAnnex import qualified GitAnnex
import qualified Remote.Helper.Encryptable import qualified Remote.Helper.Encryptable
import qualified Types.Crypto import qualified Types.Crypto
import qualified Utility.Gpg
#endif #endif
type TestEnv = M.Map String String type TestEnv = M.Map String String
@ -943,7 +943,7 @@ test_crypto env = "git-annex crypto" ~: TestList $ flip map ["shared","hybrid","
key2files cipher = Locations.keyPaths . key2files cipher = Locations.keyPaths .
Crypto.encryptKey Types.Crypto.HmacSha1 cipher Crypto.encryptKey Types.Crypto.HmacSha1 cipher
#else #else
test_crypto env = "git-annex crypto" ~: putStrLn "gpg testing not implemented on Windows" test_crypto _env = "git-annex crypto" ~: putStrLn "gpg testing not implemented on Windows"
#endif #endif
-- This is equivilant to running git-annex, but it's all run in-process -- This is equivilant to running git-annex, but it's all run in-process