diff options
Diffstat (limited to 'tests/openpgp')
| -rw-r--r-- | tests/openpgp/ChangeLog-2011 (renamed from tests/openpgp/ChangeLog) | 21 | ||||
| -rw-r--r-- | tests/openpgp/Makefile.am | 10 |
2 files changed, 18 insertions, 13 deletions
diff --git a/tests/openpgp/ChangeLog b/tests/openpgp/ChangeLog-2011 index beb6197d9..75246ddd3 100644 --- a/tests/openpgp/ChangeLog +++ b/tests/openpgp/ChangeLog-2011 @@ -1,3 +1,10 @@ +2011-12-02 Werner Koch <[email protected]> + + NB: ChangeLog files are no longer manually maintained. Starting + on December 1st, 2011 we put change information only in the GIT + commit log, and generate a top-level ChangeLog file from logs at + "make dist". See doc/HACKING for details. + 2010-05-12 Werner Koch <[email protected]> * armor.test: Add test for bug#1179. @@ -64,7 +71,7 @@ we support. This is safer than the previous setup which could hide that some ciphers weren't being tested. Plus, this automatically tests any new ciphers libgcrypt supports. - (all_hash_algos): New. + (all_hash_algos): New. * sigs.test: Use it here, and also test with >=160 bit hashes for DSA2. * conventional.test, encrypt.test, encrypt-dsa.test, @@ -122,7 +129,7 @@ * verify.test: More tests. * multisig.test: Better error printing. (sig_1ls1ls_valid, sig_ls_valid): Moved to the non-valid group. - + 2006-02-14 Werner Koch <[email protected]> * verify.test: New. @@ -204,7 +211,7 @@ 2002-05-10 Werner Koch <[email protected]> * Makefile.am: Add gpg_dearmor to all targets where it is used. - Noted by Andreas Haumer. + Noted by Andreas Haumer. 2002-04-19 Werner Koch <[email protected]> @@ -232,7 +239,7 @@ 2001-09-28 Werner Koch <[email protected]> - * defs.inc: Write a log file for each test. + * defs.inc: Write a log file for each test. * run-gpg, run-gpgm, run-gpg.patterns: Removed. Replaced in all tests by a simple macro from defs.inc. * Makefile.am (CLEANFILES): Remove log files. @@ -243,7 +250,7 @@ armencryptp.test, armencrypt.test, encryptp.test, seat.test, encrypt-dsa.test, encrypt.test: Use --always-trust because the test are not designed to check the validity. - + 2001-09-06 Werner Koch <[email protected]> * genkey1024.test: Simplified by using a parameter file. @@ -271,7 +278,7 @@ 2001-03-20 Werner Koch <[email protected]> - * Makefile.am: Import the pubdemo.asc file + * Makefile.am: Import the pubdemo.asc file * sigs.test (hash_algo_list): s/tiger/tiger192/ @@ -370,5 +377,3 @@ Mon May 18 15:40:02 1998 Werner Koch ([email protected]) 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. - - diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index 461594207..837298ddd 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -6,12 +6,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # GnuPG 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 General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. # Process this file with automake to create Makefile.in @@ -25,7 +25,7 @@ required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \ - ../../agent/gpg-agent --quiet --daemon sh + ../../agent/gpg-agent --quiet --daemon sh TESTS = version.test mds.test \ @@ -50,7 +50,7 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large -EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \ +EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) ChangeLog-2011 \ mkdemodirs signdemokey # Note that removing S.gpg-agent forces a running gpg-agent to @@ -70,7 +70,7 @@ distclean-local: prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \ ./pubring.pkr ./secring.skr ./gpg_dearmor $(DATA_FILES) - $(GPG_IMPORT) $(srcdir)/pubdemo.asc + $(GPG_IMPORT) $(srcdir)/pubdemo.asc cat $(srcdir)/gpg-agent.conf.tmpl > gpg-agent.conf echo timestamp >./prepared.stamp |