GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Make portability fix.

Browse Source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-11-21 15:35:10 +09:00
parent 56b27b21d5
commit c441fb7313
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/python/tests/Makefile.am
View File

@ -96,7 +96,7 @@ clean-local:
BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \ 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-v1.d/gpg-sample.stamp: $(private_keys) private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-gpgconf --kill all -gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \ for k in $(private_keys); do \
@ -104,7 +104,7 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
done done
echo x > ./private-keys-v1.d/gpg-sample.stamp 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 ./private-keys-v1.d/gpg-sample.stamp
$(GPG) --batch --no-permission-warning \ $(GPG) --batch --no-permission-warning \
--import $(test_srcdir)/pubdemo.asc --import $(test_srcdir)/pubdemo.asc
@ -112,12 +112,12 @@ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
--import $(test_srcdir)/secdemo.asc --import $(test_srcdir)/secdemo.asc
echo x > ./pubring-stamp echo x > ./pubring-stamp
./gpg.conf: gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.
echo no-force-v3-sigs > ./gpg.conf echo no-force-v3-sigs > ./gpg.conf
echo ignore-invalid-option agent-program >> ./gpg.conf echo ignore-invalid-option agent-program >> ./gpg.conf
echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./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. # This is required for gpg2, which does not support command fd.
echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@ echo pinentry-program $(abs_top_srcdir)/tests/gpg/pinentry >$@

8
tests/gpg/Makefile.am
View File

@ -88,7 +88,7 @@ export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO := 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 -gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \ for k in $(private_keys); do \
@ -96,17 +96,17 @@ export GPG_AGENT_INFO :=
done done
echo x > ./private-keys-v1.d/gpg-sample.stamp 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 \ $(GPG) --batch --no-permission-warning \
--import $(srcdir)/pubdemo.asc --import $(srcdir)/pubdemo.asc
-$(GPG) --batch --no-permission-warning \ -$(GPG) --batch --no-permission-warning \
--import $(srcdir)/secdemo.asc --import $(srcdir)/secdemo.asc
echo x > ./pubring-stamp echo x > ./pubring-stamp
./gpg.conf: gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.
echo no-force-v3-sigs > ./gpg.conf echo no-force-v3-sigs > ./gpg.conf
./gpg-agent.conf: gpg-agent.conf:
# This is required for gpg2, which does not support command fd. # This is required for gpg2, which does not support command fd.
echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf

8
tests/gpgsm/Makefile.am
View File

@ -58,22 +58,22 @@ export GPG_AGENT_INFO :=
BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \ BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
private-keys-v1.d/gpg-sample.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 $(GPGSM) --import $(srcdir)/cert_g10code_test1.der
touch pubring-stamp touch pubring-stamp
./gpgsm.conf: gpgsm.conf:
echo disable-crl-checks > ./gpgsm.conf echo disable-crl-checks > ./gpgsm.conf
echo faked-system-time 1008241200 >> ./gpgsm.conf echo faked-system-time 1008241200 >> ./gpgsm.conf
echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./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 -gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./private-keys-v1.d/gpg-sample.stamp
./trustlist.txt: trustlist.txt:
echo $(key_id) > ./trustlist.txt echo $(key_id) > ./trustlist.txt
echo >> ./trustlist.txt echo >> ./trustlist.txt
echo "# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE" >> ./trustlist.txt echo "# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE" >> ./trustlist.txt