aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-06 17:11:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-06 17:11:54 -0400
commitf446dcf34a1e1064246e565384e3a429adead673 (patch)
tree2bdffdd760fb1fd4371c1950a22e77215b1df644
parent02ebde51700a2c576d5124d2d98b8ecd3d3a712c (diff)
fix windows build warning
-rw-r--r--Test.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Test.hs b/Test.hs
index a58b33863..c272fb970 100644
--- a/Test.hs
+++ b/Test.hs
@@ -876,9 +876,9 @@ test_bup_remote env = "git-annex bup remote" ~: intmpclonerepo env $ when Build.
-- gpg is not a build dependency, so only test when it's available
test_crypto :: TestEnv -> Test
+#ifndef mingw32_HOST_OS
test_crypto env = "git-annex crypto" ~: TestList $ flip map ["shared","hybrid","pubkey"] $
\scheme -> TestCase $ intmpclonerepo env $ whenM (Utility.Path.inPath Utility.Gpg.gpgcmd) $ do
-#ifndef mingw32_HOST_OS
Utility.Gpg.testTestHarness @? "test harness self-test failed"
Utility.Gpg.testHarness $ do
createDirectory "dir"
@@ -943,7 +943,7 @@ test_crypto env = "git-annex crypto" ~: TestList $ flip map ["shared","hybrid","
key2files cipher = Locations.keyPaths .
Crypto.encryptKey Types.Crypto.HmacSha1 cipher
#else
- putStrLn "gpg testing not implemented on Windows"
+test_crypto env = "git-annex crypto" ~: putStrLn "gpg testing not implemented on Windows"
#endif
-- This is equivilant to running git-annex, but it's all run in-process