aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-12-14 16:08:53 +0000
committerWerner Koch <[email protected]>2007-12-14 16:08:53 +0000
commita6549ca548346765b14bc95ff70529babdd5d469 (patch)
treeaeb5d2fb9c65e65a873753bbc28cd8b00ac311c4 /tests
parentAlso add the S-TTRUST certs here. (diff)
downloadgnupg-a6549ca548346765b14bc95ff70529babdd5d469.tar.gz
gnupg-a6549ca548346765b14bc95ff70529babdd5d469.zip
Preparing a release candidate.gnupg-2.0.8rc1
Diffstat (limited to 'tests')
-rw-r--r--tests/openpgp/ChangeLog5
-rw-r--r--tests/openpgp/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog
index 07a21357b..ca64d3e18 100644
--- a/tests/openpgp/ChangeLog
+++ b/tests/openpgp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14 Werner Koch <[email protected]>
+
+ * Makefile.am (./gpg_dearmor): Reverted last change because the
+ real fix is to --no-options.
+
2007-11-22 Werner Koch <[email protected]>
* Makefile.am (./gpg_dearmor): Add --homedir so that we don't
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 3bc6d9cb8..cf32bb9b0 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -61,7 +61,7 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
./gpg_dearmor:
echo '#!/bin/sh' >./gpg_dearmor
- echo "../../g10/gpg2 --no-options --no-greeting --homedir . \
+ echo "../../g10/gpg2 --no-options --no-greeting \
--no-secmem-warning --batch --dearmor" >>./gpg_dearmor
chmod 755 ./gpg_dearmor