diff options
| author | Werner Koch <[email protected]> | 2010-01-08 19:18:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-01-08 19:18:49 +0000 |
| commit | be45bf3d544873ff4bc86496c6ab6c5f16c6a26e (patch) | |
| tree | 31c443f6d989917ea476143abc4fd5d2ae749faa /tests | |
| parent | Fix bug 1146 (diff) | |
| download | gnupg-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.tar.gz gnupg-be45bf3d544873ff4bc86496c6ab6c5f16c6a26e.zip | |
Add dummu option --passwd for gpg.
Collected changes.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/openpgp/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/openpgp/Makefile.am | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog index 21d4ef142..6afd87c63 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog @@ -1,3 +1,8 @@ +2009-12-21 Werner Koch <[email protected]> + + * Makefile.am (required_pgms): New. + (./gpg_dearmor): Depend on them. + 2009-06-05 David Shaw <[email protected]> * defs.inc: Improved all_cipher_algos and all_hash_algos to work diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index d59e29868..57d3e6d88 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -19,6 +19,10 @@ GPG_IMPORT = ../../g10/gpg2 --homedir . \ --quiet --yes --no-permission-warning --import +# Programs required before we can run these tests. +required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \ + ../../tools/gpg-connect-agent + TESTS = version.test mds.test \ decrypt.test decrypt-dsa.test \ sigs.test sigs-dsa.test \ @@ -60,7 +64,9 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ $(GPG_IMPORT) $(srcdir)/pubdemo.asc echo timestamp >./prepared.stamp -./gpg_dearmor: +# We need to depend on a couple of programs so that the tests don't +# start before all programs are built. +./gpg_dearmor: $(required_pgms) echo '#!/bin/sh' >./gpg_dearmor echo "../../g10/gpg2 --no-options --no-greeting \ --no-secmem-warning --batch --dearmor" >>./gpg_dearmor |