diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/openpgp/defs.inc | 2 | ||||
| -rwxr-xr-x | tests/openpgp/gpgtar.test | 2 | ||||
| -rwxr-xr-x | tests/openpgp/mkdemodirs | 2 | ||||
| -rwxr-xr-x | tests/openpgp/signdemokey | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 4e09c2327..bab0b7d37 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -20,7 +20,7 @@ # Programs required before we can run these tests. -required_pgms = ../../g10/gpg2$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \ +required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \ ../../tools/gpg-connect-agent$(EXEEXT) \ ../../tools/mk-tdata$(EXEEXT) diff --git a/tests/openpgp/defs.inc b/tests/openpgp/defs.inc index 8f969db26..ea86c6919 100755 --- a/tests/openpgp/defs.inc +++ b/tests/openpgp/defs.inc @@ -215,7 +215,7 @@ fi unset GPG_AGENT_INFO # (--no-permission-warning makes only sense on the commandline) -GPG="../../g10/gpg2 --no-permission-warning " +GPG="../../g10/gpg --no-permission-warning " # (We may not use a relative name for gpg-agent.) GPG_AGENT="$(cd ../../agent && /bin/pwd)/gpg-agent" GPG_CONNECT_AGENT="../../tools/gpg-connect-agent" diff --git a/tests/openpgp/gpgtar.test b/tests/openpgp/gpgtar.test index daba514fe..63bed7025 100755 --- a/tests/openpgp/gpgtar.test +++ b/tests/openpgp/gpgtar.test @@ -27,7 +27,7 @@ FILELIST="${TESTDIR}/filelist" PPFILE="${TESTDIR}/passphrase" PPFLAGS="--gpg-args --passphrase-file=$PPFILE" -GPG=../../g10/gpg2 +GPG=../../g10/gpg GPGARGS="$opt_always --no-permission-warning" GPGTAR="../../tools/gpgtar" diff --git a/tests/openpgp/mkdemodirs b/tests/openpgp/mkdemodirs index a381681b0..fd8a7410e 100755 --- a/tests/openpgp/mkdemodirs +++ b/tests/openpgp/mkdemodirs @@ -4,7 +4,7 @@ set -e # We need to use --no-options so that a gpg.conf from an older version # of gpg is not used. -GPG="../../g10/gpg2 --no-options --batch --quiet +GPG="../../g10/gpg --no-options --batch --quiet --no-secmem-warning --allow-secret-key-import" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India diff --git a/tests/openpgp/signdemokey b/tests/openpgp/signdemokey index 9a1257cc4..13c5784de 100755 --- a/tests/openpgp/signdemokey +++ b/tests/openpgp/signdemokey @@ -10,7 +10,7 @@ name="$1" user_id="$2" user_id_no="$3" -echo "abc" | ../g10/gpg2 --options ./gpg.conf --homedir $name \ +echo "abc" | ../g10/gpg --options ./gpg.conf --homedir $name \ --sign-key --batch --yes --passphrase-fd 0 $user_id \ $user_id_no sign save |