aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2014-09-18 14:00:34 +0000
committerWerner Koch <[email protected]>2014-09-24 12:46:47 +0000
commit2e8ecc24cf74f918c303c315da3bb18636a5e288 (patch)
treeb4174ccb08c48b1cbf51aa860442aad4b2807bee
parentClean up gpgme's tests/gpg when gpg2.1 is available (diff)
downloadgpgme-2e8ecc24cf74f918c303c315da3bb18636a5e288.tar.gz
gpgme-2e8ecc24cf74f918c303c315da3bb18636a5e288.zip
tests: Delay some test file extraction until "make check".
* tests/gpg/Makefile.am (all-local): Change to check-local. * tests/gpgsm/Makefile.am (all-local): Ditto.
-rw-r--r--tests/gpg/Makefile.am2
-rw-r--r--tests/gpgsm/Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index b428cf22..5c1266ec 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -70,7 +70,7 @@ clean-local:
-$(srcdir)/start-stop-agent --stop
-rm -fR private-keys-v1.d
-all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
+check-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
./private-keys-v1.d/gpg-sample.stamp
export GNUPGHOME := $(abs_builddir)
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 45b3b50c..ecc53a61 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -47,7 +47,8 @@ clean-local:
-gpg-connect-agent KILLAGENT /bye
-rm -fR private-keys-v1.d
-all-local: ./pubring.kbx ./gpgsm.conf ./private-keys-v1.d/$(key_id).key ./trustlist.txt
+check-local: ./pubring.kbx ./gpgsm.conf \
+ ./private-keys-v1.d/$(key_id).key ./trustlist.txt
export GNUPGHOME := $(abs_builddir)