aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <[email protected]>2014-09-23 16:46:00 +0000
committerWerner Koch <[email protected]>2014-09-24 12:44:51 +0000
commit36997e0f746ce2d38de997055141542583cc0f52 (patch)
treed704c5be2c8581bc0b8665356f5c400e20fcb365
parentgpgme-tool: Print fingerprint and keyid with keyservers. (diff)
downloadgpgme-36997e0f746ce2d38de997055141542583cc0f52.tar.gz
gpgme-36997e0f746ce2d38de997055141542583cc0f52.zip
Clean up gpgme's tests/gpg when gpg2.1 is available
* tests/gpg/Makefile.am: Clean up .gpg-v21-migrated -- We also need to gitignore this file.
-rw-r--r--tests/gpg/.gitignore1
-rw-r--r--tests/gpg/Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/gpg/.gitignore b/tests/gpg/.gitignore
index e60bfe51..d79ace74 100644
--- a/tests/gpg/.gitignore
+++ b/tests/gpg/.gitignore
@@ -1,4 +1,5 @@
.deps
+.gpg-v21-migrated
.libs
gpg-agent.conf
gpg.conf
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index e72bd492..b428cf22 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -43,7 +43,7 @@ TESTS = initial.test $(c_tests) final.test
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
- random_seed S.gpg-agent
+ random_seed S.gpg-agent .gpg-v21-migrated
private_keys = \
13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \