aboutsummaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-19 17:59:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-19 17:59:58 -0400
commitb1e0c707bcf4e281d0bfefa06effc9b3fcb3f92e (patch)
tree6402758cfcea96e53203cd4ef4be9a45735aad6b /Test.hs
parent1b028411570973f4a18ce155c080161084952e87 (diff)
Allow building with gpg2.
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Test.hs b/Test.hs
index 1274f974b..f063b9180 100644
--- a/Test.hs
+++ b/Test.hs
@@ -732,7 +732,7 @@ 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
-test_crypto env = "git-annex crypto" ~: intmpclonerepo env $ when Build.SysConfig.gpg $ do
+test_crypto env = "git-annex crypto" ~: intmpclonerepo env $ whenM (Utility.Path.inPath Utility.Gpg.gpgcmd) $ do
#ifndef __WINDOWS__
Utility.Gpg.testTestHarness @? "test harness self-test failed"
Utility.Gpg.testHarness $ do