aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2017-11-21 06:35:10 +0000
committerNIIBE Yutaka <[email protected]>2017-11-21 06:35:10 +0000
commitc441fb73130f4c117094d7da4de9fe56f886e65d (patch)
tree01acad29fe6d2bfab1ce2c8e650777fe418c7cfd
parentqt: Fix IODeviceDataProvider with Process (diff)
downloadgpgme-c441fb73130f4c117094d7da4de9fe56f886e65d.tar.gz
gpgme-c441fb73130f4c117094d7da4de9fe56f886e65d.zip
tests: Make portability fix.
* lang/python/tests/Makefile.am: Distinguish target and path. * tests/gpg/Makefile.am: Ditto. * tests/gpgsm/Makefile.am: Ditto. -- GNU Make is powerful enough to match path to target (and vice versa), but BSD make is not. GnuPG-bug-id: 3056 Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--lang/python/tests/Makefile.am8
-rw-r--r--tests/gpg/Makefile.am8
-rw-r--r--tests/gpgsm/Makefile.am8
3 files changed, 12 insertions, 12 deletions
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index beb5a309..25b15f2b 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -96,7 +96,7 @@ clean-local:
BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
private-keys-v1.d/gpg-sample.stamp
-./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
+private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \
@@ -104,7 +104,7 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
done
echo x > ./private-keys-v1.d/gpg-sample.stamp
-./pubring-stamp: $(test_srcdir)/pubdemo.asc \
+pubring-stamp: $(test_srcdir)/pubdemo.asc \
./private-keys-v1.d/gpg-sample.stamp
$(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/pubdemo.asc
@@ -112,12 +112,12 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
--import $(test_srcdir)/secdemo.asc
echo x > ./pubring-stamp
-./gpg.conf:
+gpg.conf:
# This is required for t-sig-notations.
echo no-force-v3-sigs > ./gpg.conf
echo ignore-invalid-option agent-program >> ./gpg.conf
echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpg.conf
-./gpg-agent.conf:
+gpg-agent.conf:
# This is required for gpg2, which does not support command fd.
echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index b2e8837a..642e0a08 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -88,7 +88,7 @@ export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO :=
-./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
+private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \
@@ -96,17 +96,17 @@ export GPG_AGENT_INFO :=
done
echo x > ./private-keys-v1.d/gpg-sample.stamp
-./pubring-stamp: $(srcdir)/pubdemo.asc ./private-keys-v1.d/gpg-sample.stamp
+pubring-stamp: $(srcdir)/pubdemo.asc ./private-keys-v1.d/gpg-sample.stamp
$(GPG) --batch --no-permission-warning \
--import $(srcdir)/pubdemo.asc
-$(GPG) --batch --no-permission-warning \
--import $(srcdir)/secdemo.asc
echo x > ./pubring-stamp
-./gpg.conf:
+gpg.conf:
# This is required for t-sig-notations.
echo no-force-v3-sigs > ./gpg.conf
-./gpg-agent.conf:
+gpg-agent.conf:
# This is required for gpg2, which does not support command fd.
echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index 274ba9d0..3774c5ff 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -58,22 +58,22 @@ export GPG_AGENT_INFO :=
BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
private-keys-v1.d/gpg-sample.stamp
-./pubring-stamp: $(srcdir)/cert_g10code_test1.der ./private-keys-v1.d/gpg-sample.stamp
+pubring-stamp: $(srcdir)/cert_g10code_test1.der ./private-keys-v1.d/gpg-sample.stamp
$(GPGSM) --import $(srcdir)/cert_g10code_test1.der
touch pubring-stamp
-./gpgsm.conf:
+gpgsm.conf:
echo disable-crl-checks > ./gpgsm.conf
echo faked-system-time 1008241200 >> ./gpgsm.conf
echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpgsm.conf
-./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
+private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id)
-gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d
cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
echo x > ./private-keys-v1.d/gpg-sample.stamp
-./trustlist.txt:
+trustlist.txt:
echo $(key_id) > ./trustlist.txt
echo >> ./trustlist.txt
echo "# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE" >> ./trustlist.txt