From 3ca7e96e384d5872c71ceb3b2e2a05b0c1b7e1a0 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 12 Aug 2013 14:32:21 +0200
Subject: [PATCH] Make test suite workable with GnuPG 2.1.

* tests/gpg/start-stop-agent: New.
* tests/gpg/initial.test: New.
* tests/gpg/final.test: New.
* tests/gpg/Makefile.am (c_tests): New.
(TESTS): Move all to c_tests.  Add initial.test, final.test, and
c_tests.
(TESTS_ENVIRONMENT): Add C_ALL=C
(private_keys): New.
(EXTRA_DIST): Add new files.
(./private-keys-v1.d/gpg-sample.stamp): Copy private keys.
(all-local): Depend on gpg-sample.stamp.
* tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F: New.
* tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD: New.
* tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66: New.
* tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C: New.
* tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD: New.
--

GnuPG 2.1 requires that the agent knows the private keys.  Thus we
need to install them.  The code should still work with GnuPG < 2.1.

To make the whole testing using a agent more robust, the way to start
the agent has also be changed.
---
 .../13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F  | Bin 0 -> 682 bytes
 .../13CD0F3BDF24BE53FE192D62F18737256FF6E4FD  | Bin 0 -> 828 bytes
 .../76F7E2B35832976B50A27A282D9B87E44577EB66  | Bin 0 -> 493 bytes
 .../7A030357C0F253A5BBCD282FFC4E521B37558F5C  | Bin 0 -> 636 bytes
 .../A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD  | Bin 0 -> 636 bytes
 tests/gpg/Makefile.am                         |  47 +++++++++++++-----
 tests/gpg/final.test                          |   4 ++
 tests/gpg/initial.test                        |   4 ++
 tests/gpg/start-stop-agent                    |  45 +++++++++++++++++
 9 files changed, 87 insertions(+), 13 deletions(-)
 create mode 100644 tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F
 create mode 100644 tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD
 create mode 100644 tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66
 create mode 100644 tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
 create mode 100644 tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
 create mode 100755 tests/gpg/final.test
 create mode 100755 tests/gpg/initial.test
 create mode 100755 tests/gpg/start-stop-agent

diff --git a/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F b/tests/gpg/13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F
new file mode 100644
index 0000000000000000000000000000000000000000..4ec6d13506ffb9e559e1e5534518bc85bca904fb
GIT binary patch
literal 682
zcmdNeGPEiv$}dSxE=f(%Ehx$?ODsv%%}%Y<Ft$o5PSgO(8X8$zF*Nc_Zi~OL|G2=^
zl*_*?YJL^$%Qr55G}A#b{JlG4sJ~;x<T*jBCpKSlR*8?cI2U}x@2XWLN6qiYyZG`~
z{I%a_Bp<!${h8M0R=w7Ou&#<cjzy~;G>ILU$)q8eebrxn_px2ci(~p$G&4IblN8D}
z_&L3*^oiO;H<`RYYrW5QU*f6P1iGXU=vIbZJZBYl)ZZ<0O7(9H_$C*#e|Z2SNHQJl
z%!cb}5?}X(9&gf5ouzS#&nTn7AtNife(MsW7jH^k1%An0KVaJzEGV1)UUF~CnIk`5
ze^prJ{>R_?rbN`W)m!&(@5^33dB@e(3%8$n%2z)9b<gc^p8FwR#eI{u^tQO)DrR+m
ze9B?(GTsfg4|X4#!l@7+EdD6!iuAD?{R^{mJl~&d0J)^n(8$7yUC{f0)p5&@ZRe+M
z;y*RFv&8XztV!^VOG2U2lMT5QK7FnIRxIJ3Fr_{3%Z@*rZi_|n|CA`0Uw^Ga;*EZ0
z?&h$CabN5ld8~gee!aOPOm(WgsiNXl!A09%N=eVT*H9cRyr6Sswc;irTOnOO4zq=`
zBpyj^a=25&Wjiy4=kSuV>$x;FED`Z)WNMXPkeXMJUZ7iSlx?hAoRMg#o0wXxo1B!a
zp<!YL;#*kx9Qm?y>+2<%=2m7Vrbb3aCYpw3R%dm#?D#+B+NHVowq^TQKiAQ;FtC!Z
z>NWT0Z*V@<%r5D!f1+4^gOkZ$i}OEUYE1W-a+lFkRqK6zR&duwe=h%%?(3ffe_5ZK
zn6NYQ`Fe4|wvVALeDjJQt(b3^vE=!pr#52o6Gef6W`uC8Zeod{sg;p|p|OF5p;3sT
MfvKUfiKeC|0DW63AOHXW

literal 0
HcmV?d00001

diff --git a/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD b/tests/gpg/13CD0F3BDF24BE53FE192D62F18737256FF6E4FD
new file mode 100644
index 0000000000000000000000000000000000000000..16138cf75bc08cf59fb919226d0d1fc41156b727
GIT binary patch
literal 828
zcmV-C1H=3%GBG-Ea&L5HV{~O?EpT#ac42g7Eo)_YC^I@`Y-cDjI&d*LGdckGHH0c|
zUS^XF1sfuyy$Dg{iW4V_QZNBui`X{m<>QaGho(HNdHbwwW&HDF-_;3R84DIYW0S-;
z+W)r&0OP+4{8N{|kvImG{^1{Wl3RZfk(@Q~<=6`O=vqc6c#DINug4!|)irsOY0WuC
zKvX?T_{tikXj)`d%P=Twgf$#)j{nqJ^+o&rkMiV@f=Py__Zz|U6Ob<n1yaie8p(!T
zZfc#0jhm8INmNi5vsL}gB*vguJb3JL>MdD#%Dx*ZC^0%`F**h*C^0&DF*!0iPr5lr
z<c>~Kd)cQygI%?MSp{ELTSi1G+K`C%nv;4Obpsbtz-{iYYb6vX;_;BpQmF-8n(V)s
zq1PwstGv?XKBXBxWjSzzWv~w03XNrrRVn9!b<4xqQyz!K@g@Ac%T`MMAvLGUr=mtF
z19`<C;z+UD*OQkXh~4KZPnr#>l#yL*CpUzfk$XUQy3&A3ZBd9&UIc_{x^<;;cqfYB
zs8+c4GKferYOa68mRm=Ak#W_!Uyvdgm5DgyC>r&%DJVHQaB^>SWn*+@WHL26Z*XO9
zaA$BWb24i)EpupLF)d+bb1h?HV<;#zI&)}YF*rK5lo96BZz3f(IyEvhGB`LeDKR!W
z??{t#^ymL7p&5O<b<LL`DKa%SI`~I=tZUuHGoY&L_9esF(htO3&&^8(V)d0Wx;=!|
zmJSF6z1VM0PaQzcf-H#D*OC;jea&S;LP_+zGZNoM4}4FUoKdP0>HWdKh~=SBtTV0O
z7iEg4wWmZS{2R`0EIau5oYdrgj;9}#zVC%hEjIcAnpL`r`AA+pHuN-UDLdh8;M>d%
zWh=D;bLB@Oktl7stdwlufs;rYt?S8OG7<Zbb8g7m@n0Lns0+@F5yIX=u0kG9H<oDl
z;1H(d<x*qj(^{ofwb|;!bPon7aDU7;7A$-0H4_V{d^5)Xp*KUx2+Z1{;LxixZ8*Zs
ztJ9>zMXdYpoLM<N-)B*n2`MNsGCFW_Z**m2bY)~MVRSJyIx;XZFflMNI8-n<FflYZ
GDJdy+MSMg6

literal 0
HcmV?d00001

diff --git a/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66 b/tests/gpg/76F7E2B35832976B50A27A282D9B87E44577EB66
new file mode 100644
index 0000000000000000000000000000000000000000..079cc7be0cfe64c784abc5cda3a7ce94a1543f61
GIT binary patch
literal 493
zcmV<J0TTWwF)=!Da%py9bY(4TWqBwwI%IQUC^0&4F)}$i0JdeZLtjiLB#$yIHV|}(
znRp9_E@$!{%9m)dlrfuDhzsZb6KQhX8is7jo0=Djan!v@3poue^0TG8UT2368qLl0
ztuys5!X%%Z&P3V8b_N3J60(HnqMQD=`}~Hr+0&bkWmWcqs|y5}5QLF-o>(!e`X{w-
z&q?#t`k(S@yD2C!I&m^FIsl;wBUR-_8{mISGJ5+cpLBJQR!1o)F*;{4GB`RF!^pMQ
z<K>4K{hE5-bzV}ajbX5{nVj^q&te=D{TCEFw;t658_{uPQBgsKjR``NKesRBHZPhP
zVRMQG(D-l`W<@Up&y^qrXL#SK`61yLjEhZjsR4xQ<Df9USy|*NZ+}gKr~j7KrE&vG
zrv+m&c#Kz>A4fVarN<fhayFwWC^0&DF)}zhRc7bTU21|}KyS~3vfU0vZZr_n|E<f)
z!=J;GY9r#~QF2moBIvWes~}R-(PN#M{`mPEMa9<l)Q!er2}O>~xY6zB0xuAKqclT_
z_FFT}kwFc+u(CDBD}H{I_Qn$~y~HE->LD6`D+(#JS0)iP3+rU@Da!b1y4uLEn6LS2
jDJU^Icrr0M0F|Jg@0!WG6kx0Z+@T5f;Gd7r)hQ_{pG)WW

literal 0
HcmV?d00001

diff --git a/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C b/tests/gpg/7A030357C0F253A5BBCD282FFC4E521B37558F5C
new file mode 100644
index 0000000000000000000000000000000000000000..ad505abf3bc5f9aa6d1be248a911766ff13093f6
GIT binary patch
literal 636
zcmdNeGPEiv$}dSxE=f(%Ehx$?ODsv%%}%Y<Ft$p~N!I|%8X8$zF`TLSaL}pQc>mm<
zS!RDcug%a{T)e`(Ry#`KmN<`>es@9Hf**@qt(6+<OIFCGi~Rf0V*copA7^r+Qu7S=
z9|z~|tJwZZjAbs%tg>Tym0j|CIZ7Ygz54O1+VPGgCuQ-I8QtpUwpV9N?B}sKICc5|
zHp}|AYWePuIhO_<waIw=?(sr@O`uEC4Xs!~bfuw@g_Rfgm(1-=vEiZdj4iXoLoWur
z_*{F!Q9N*W%-Ww!&m)D|e0wt-SLMhr;Xc?hv&Ja(=x#>l>i88))-Dy9U6SnUcW9qW
z`@#+BvE9{TQZoak^1`=IS~;=*S@Cag(Pf+_ry3f+PAFIzDI--a)Y{XelEgDrY_-er
z>nzR-zD+EC_*3$hriLXV;EYVI@(WV)3epR7i;c34b&E3+4RsS!i*=Kek~K6;tU!FA
zldrG7k^IG#(cH?+#MH>h$VAi7%xd>V&c@8>K&B;H$IHB@^~q@(S{hk(Z~iCwYHLFu
zi<_6@6Gi_`*C*{&l#X&d%>T)aHz{+9jMpNyeIf6PlN7HlD*1nkOHJBx-e-rPo|w8{
z6V`<N)}H(6(u2DqeXqnT?DnlZZ(lt16KiV9T9>z9&oQz*x?Ht$wXS5iM&<8Eg=zK@
zrE#ghZhx@fQ*0=*<<jBe!)p_#{O{QEl{?Jh`^yhDAD8rT><W2pz+ts*ONp~!tEno-
z`cF~od?l`Dh%L1LrXpK2WnJ@SozImEp2pwZl^T6{-8%upi!Q)eGD3uoZeod{sg;p|
Up|OF5p;3sTfvKUfsivkT0OdLrw*UYD

literal 0
HcmV?d00001

diff --git a/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD b/tests/gpg/A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
new file mode 100644
index 0000000000000000000000000000000000000000..f30792e30ef707dd6ff82fb40166451f96789da5
GIT binary patch
literal 636
zcmdNeGPEiv$}dSxE=f(%Ehx$?ODsv%%}%Y<Ft$p~N!I|%8X8$zG0f?`E+777w{mUm
z%n$E#-pHJ>zP!R(Fn8}9I}u*S9o8n1VJfQw*QMXT-tm^}zR&xuGoR*f_Sqx;`Mucb
z%AUGCYd$@f)VhAYTX=fNkD{(p5lO9G9~!ioPoMU5d1vvKTS?bahr_DhaH08)2NPN1
z(zQ13+^13f_hd`!-=-a$|86UrYXV)8ZfM00qALxJEUYA-J~P_5=s7d<y_Nj=W?zlg
z=!6Jmy`SE#FTLl<B;K1v4AOiPE(B#h>bv_uKwt&4@%G~0;NUr&na+*^ANwOe&GCzD
z6i5o|Sy$r7-Ei|p+uSoA-cy=4KM~FRXZ~>AevQz80?ny!*4z81?D<#SrvB^1l%St+
z-Pd05U;38D(kHu;UsJ;p5pYJPR`~^~c?IbOy2VD>#=6BBiH5p~sl~d<Ny!=-CRQN6
zg;iR40{`2ut|!c`OpQ#8EG!H(4b7}}EZn(mPvVs=h0<I5f{rlE)HJj-vU+*JH0`@#
z;%4243Dq5Ou0J-mUk$4_v*f<I(em5z)#3RJPSfA<KWq_?IlWk?{=$2!cbAx62CXVK
zT%r|jHrJ<AinHbIl4ZZYyk2^(cWq`A?_{e9^^;jH*+v!i-nb>YHZ;h0tBJh%dh62#
zj$f`CuT$RcvUbkO9X=;N9Ot~g>K)g<$I`|8`4;{gmz>ZHd2}Zu?j&o#B!@>i0Ya<>
z{Y&N5^d7qK+zNW}#(Lour875P7G3YoUV8td=+r|?J7+g{zxNXa#g-8wbaWF-3{9<!
U3=DzLz#_!J+`!1tOjA=60NxuK`Tzg`

literal 0
HcmV?d00001

diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index dd28d5e0..c9000c93 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -1,18 +1,18 @@
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -20,8 +20,9 @@
 ## Process this file with automake to produce Makefile.in
 
 GPG = @GPG@
+GPG_AGENT = @GPG_AGENT@
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) LC_ALL=C GPG_AGENT_INFO=
 
 # The keylist tests must come after the import and the edit test.
 noinst_HEADERS = t-support.h
@@ -32,17 +33,29 @@ else
 tests_unix = t-eventloop t-thread1
 endif
 
-TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
+c_tests = \
+        t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
 	t-import t-trustlist t-edit t-keylist t-keylist-sig t-wait	\
 	t-encrypt-large t-file-name t-gpgconf $(tests_unix)
 
+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
+	random_seed S.gpg-agent
 
-EXTRA_DIST = pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
-	geheim.txt pubkey-1.asc seckey-1.asc pinentry
+private_keys = \
+        13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
+        76F7E2B35832976B50A27A282D9B87E44577EB66 \
+        A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
+        13CBE3758AFE42B5E5E2AE4CED27AFA455E3F87F \
+        7A030357C0F253A5BBCD282FFC4E521B37558F5C
+
+
+EXTRA_DIST = start-stop-agent initial.test final.test \
+        pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
 INCLUDES = -I$(top_builddir)/src
 
@@ -51,17 +64,25 @@ LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 
 # We don't run t-genkey in the test suite, because it takes too long
-noinst_PROGRAMS = $(TESTS) t-genkey
+noinst_PROGRAMS = $(c_tests) t-genkey
 
 clean-local:
-	-gpg-connect-agent KILLAGENT /bye
+	-$(srcdir)/start-stop-agent --stop
 	-rm -fR private-keys-v1.d
 
-all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg 
+all-local: ./gpg.conf ./gpg-agent.conf ./pubring.gpg \
+           ./private-keys-v1.d/gpg-sample.stamp
 
 export GNUPGHOME := $(abs_builddir)
 
-export GPG_AGENT_INFO := 
+export GPG_AGENT_INFO :=
+
+./private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys)
+	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	for k in $(private_keys); do \
+          cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
+        done
+	echo x > ./private-keys-v1.d/gpg-sample.stamp
 
 ./pubring.gpg: $(srcdir)/pubdemo.asc
 	-$(GPG) --no-permission-warning \
diff --git a/tests/gpg/final.test b/tests/gpg/final.test
new file mode 100755
index 00000000..5148a34b
--- /dev/null
+++ b/tests/gpg/final.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${srcdir}/start-stop-agent --stop
+exit 0
diff --git a/tests/gpg/initial.test b/tests/gpg/initial.test
new file mode 100755
index 00000000..1981c99d
--- /dev/null
+++ b/tests/gpg/initial.test
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+${srcdir}/start-stop-agent --start
+exit 0
diff --git a/tests/gpg/start-stop-agent b/tests/gpg/start-stop-agent
new file mode 100755
index 00000000..ab47d8d9
--- /dev/null
+++ b/tests/gpg/start-stop-agent
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Copyright (C) 2013 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.  This file is
+# distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY, to the extent permitted by law; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+if [ -z "$(command -v gpg-connect-agent)" ]; then
+   echo "gpg-agent not installed and thus not started" >&2
+   exit 0;
+fi
+
+GPG_AGENT_INFO=
+export GPG_AGENT_INFO
+
+token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
+
+if [ "$1" = "--stop" ]; then
+  if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+        != "D set" ]; then
+    echo "gpg-agent not running" >&2
+    exit 0
+  fi
+  echo "stopping gpg-agent " >&2
+  gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1
+  exit 0
+fi
+
+if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+      = "D set" ]; then
+  echo "gpg-agent already running" >&2
+  exit 0
+fi
+
+echo "starting gpg-agent " >&2
+gpg-connect-agent putval\ $token\ set /bye >/dev/null 2>&1
+if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
+      != "D set" ]; then
+  echo "error starting gpg-agent" >&2
+  exit 1
+fi
+exit 0