[svn] GnuPG - r4698 - in trunk: . po tests tests/pkits
svn author wk
cvs at cvs.gnupg.org
Tue Feb 19 13:58:51 CET 2008
Author: wk
Date: 2008-02-19 13:58:34 +0100 (Tue, 19 Feb 2008)
New Revision: 4698
Modified:
trunk/ChangeLog
trunk/README
trunk/configure.ac
trunk/po/be.po
trunk/po/ca.po
trunk/po/cs.po
trunk/po/da.po
trunk/po/de.po
trunk/po/el.po
trunk/po/eo.po
trunk/po/es.po
trunk/po/et.po
trunk/po/fi.po
trunk/po/fr.po
trunk/po/gl.po
trunk/po/hu.po
trunk/po/id.po
trunk/po/it.po
trunk/po/ja.po
trunk/po/nb.po
trunk/po/pl.po
trunk/po/pt.po
trunk/po/pt_BR.po
trunk/po/ro.po
trunk/po/ru.po
trunk/po/sk.po
trunk/po/sv.po
trunk/po/tr.po
trunk/po/zh_CN.po
trunk/po/zh_TW.po
trunk/tests/ChangeLog
trunk/tests/Makefile.am
trunk/tests/pkits/ChangeLog
trunk/tests/pkits/Makefile.am
trunk/tests/pkits/common.sh
trunk/tests/pkits/inittests
Log:
Fixed release creation.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/ChangeLog 2008-02-19 12:58:34 UTC (rev 4698)
@@ -1,3 +1,7 @@
+2008-02-19 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Remove --with-pkits-tests.
+
2008-02-15 Werner Koch <wk at g10code.com>
* gl/allocsa.h, gl/m4/allocsa.m4: Replace HAVE_LONG_LONG by
Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/ChangeLog 2008-02-19 12:58:34 UTC (rev 4698)
@@ -1,3 +1,7 @@
+2008-02-19 Werner Koch <wk at g10code.com>
+
+ * Makefile.am: Always run pkits tests.
+
2008-01-17 Werner Koch <wk at g10code.com>
* asschk.c (read_assuan): Use __func__ instead of __FUNCTION__.
Modified: trunk/tests/pkits/ChangeLog
===================================================================
--- trunk/tests/pkits/ChangeLog 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/pkits/ChangeLog 2008-02-19 12:58:34 UTC (rev 4698)
@@ -1,5 +1,10 @@
2008-02-19 Werner Koch <wk at g10code.com>
+ * inittests: Unpack test data onlyu if available.
+ * common.sh: Skip tests if PKITS test data is not available.
+ * Makefile.am: Do not distribute test data. This allows to
+ include the test suite in the distribution.
+
* signature-verification: New.
* validity-periods: New.
* verifying-name-chaining: New.
@@ -29,15 +34,15 @@
2006-05-02 Werner Koch <wk at g10code.com>
- * PKITS_data.tar.bz2: Repackaged new copy becuase the old one got
- corrupted by the conversion fromCVS to SVN.
+ * PKITS_data.tar.bz2: Repackaged new copy because the old one got
+ corrupted by the conversion from CVS to SVN.
2004-08-16 Werner Koch <wk at g10code.de>
Started implementing PKITS based tests.
- Copyright 2004 Free Software Foundation, Inc.
+ Copyright 2004, 2008 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/README
===================================================================
--- trunk/README 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/README 2008-02-19 12:58:34 UTC (rev 4698)
@@ -2,8 +2,8 @@
=========================
Version 2.0
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008 Free Software Foundation, Inc.
INTRODUCTION
@@ -64,6 +64,8 @@
In case of problem please ask on gnupg-users at gnupg.org for advise. Note
that this release is only expected to build on GNU and *BSD systems.
+Note that the PKITS tests are always skipped unless you copy the PKITS
+test data file into the tests/pkits directory.
DOCUMENTATION
@@ -80,7 +82,6 @@
http://www.gnupg.org/documentation/manuals/gnupg-devel/ .
-
GNUPG 1.4 AND GNUPG 2.0
=======================
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/configure.ac 2008-02-19 12:58:34 UTC (rev 4698)
@@ -1171,12 +1171,6 @@
# Check for readline support
GNUPG_CHECK_READLINE
-# See wether we want to run the long test suite.
-AC_ARG_WITH(pkits-tests,
- AC_HELP_STRING([--with-pkits-tests],[run the PKITS based tests]),
- [run_pkits_tests=$withval], [run_pkits_tests=no])
-AM_CONDITIONAL(RUN_PKITS_TESTS, test "$run_pkits_tests" = "yes")
-
#
# Allow users to append something to the version string without
# flagging it as development version. The user version parts is
@@ -1417,9 +1411,6 @@
AC_OUTPUT
-
-
-
echo "
GnuPG v${VERSION} has been configured as follows:
@@ -1435,8 +1426,7 @@
Default pinentry: $show_gnupg_pinentry_pgm
Default scdaemon: $show_gnupg_scdaemon_pgm
Default dirmngr: $show_gnupg_dirmngr_pgm
-
- PKITS based tests: $run_pkits_tests"
+"
if test x"$use_regex" != xyes ; then
echo "
Warning: No regular expression support available.
Modified: trunk/po/be.po [not shown]
Modified: trunk/po/ca.po [not shown]
Modified: trunk/po/cs.po [not shown]
Modified: trunk/po/da.po [not shown]
Modified: trunk/po/de.po [not shown]
Modified: trunk/po/el.po [not shown]
Modified: trunk/po/eo.po [not shown]
Modified: trunk/po/es.po [not shown]
Modified: trunk/po/et.po [not shown]
Modified: trunk/po/fi.po [not shown]
Modified: trunk/po/fr.po [not shown]
Modified: trunk/po/gl.po [not shown]
Modified: trunk/po/hu.po [not shown]
Modified: trunk/po/id.po [not shown]
Modified: trunk/po/it.po [not shown]
Modified: trunk/po/ja.po [not shown]
Modified: trunk/po/nb.po [not shown]
Modified: trunk/po/pl.po [not shown]
Modified: trunk/po/pt.po [not shown]
Modified: trunk/po/pt_BR.po [not shown]
Modified: trunk/po/ro.po [not shown]
Modified: trunk/po/ru.po [not shown]
Modified: trunk/po/sk.po [not shown]
Modified: trunk/po/sv.po [not shown]
Modified: trunk/po/tr.po [not shown]
Modified: trunk/po/zh_CN.po [not shown]
Modified: trunk/po/zh_TW.po [not shown]
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/Makefile.am 2008-02-19 12:58:34 UTC (rev 4698)
@@ -19,21 +19,13 @@
## Process this file with automake to produce Makefile.in
-#if RUN_PKITS_TESTS
-#pkits = pkits
-#else
-#pkits =
-#endif
-#
-#SUBDIRS = . ${pkits}
-
if RUN_GPG_TESTS
openpgp = openpgp
else
openpgp =
endif
-SUBDIRS = ${openpgp}
+SUBDIRS = ${openpgp} . pkits
GPGSM = ../sm/gpgsm
Modified: trunk/tests/pkits/Makefile.am
===================================================================
--- trunk/tests/pkits/Makefile.am 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/pkits/Makefile.am 2008-02-19 12:58:34 UTC (rev 4698)
@@ -43,7 +43,7 @@
private-certificate-extensions
-EXTRA_DIST = PKITS_data.tar.bz2 inittests runtest $(testscripts)
+EXTRA_DIST = inittests runtest common.sh $(testscripts)
import-all-certs.data
TESTS = $(testscripts)
@@ -69,3 +69,4 @@
for test in $(testscripts); do \
./$${test} && true; \
done
+
Modified: trunk/tests/pkits/common.sh
===================================================================
--- trunk/tests/pkits/common.sh 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/pkits/common.sh 2008-02-19 12:58:34 UTC (rev 4698)
@@ -1,4 +1,3 @@
-#!/bin/sh
# common.sh - common defs for all tests -*- sh -*-
# Copyright (C) 2004, 2008 Free Software Foundation, Inc.
#
@@ -39,6 +38,12 @@
exit 1
fi
+if [ -f PKITS_data.tar.bz2 ]; then
+ :
+else
+ # Exit code 77 is used by the makefile for skipping a tests.
+ exit 77
+fi
#--------------------------------
#------ utility functions -------
Modified: trunk/tests/pkits/inittests
===================================================================
--- trunk/tests/pkits/inittests 2008-02-19 10:33:35 UTC (rev 4697)
+++ trunk/tests/pkits/inittests 2008-02-19 12:58:34 UTC (rev 4698)
@@ -21,17 +21,17 @@
[ -z "$srcdir" ] && srcdir=.
[ -z "$GPGSM" ] && GPGSM=../../sm/gpgsm
-if [ -f $srcdir/README ] \
- && grep tests/pkits/README README >/dev/null 2>&1; then
- :
-else
- # During make distclean the Makefile has already been removed,
- # so we need this extra test.
- if ! grep gnupg-test-pkits-directory testdir.stamp >/dev/null 2>&1; then
- echo "inittests: please cd to the tests/pkits directory first" >&2
- exit 1
- fi
-fi
+#if [ -f $srcdir/README ] \
+# && grep tests/pkits/README README >/dev/null 2>&1; then
+# :
+#else
+# # During make distclean the Makefile has already been removed,
+# # so we need this extra test.
+# if ! grep gnupg-test-pkits-directory testdir.stamp >/dev/null 2>&1; then
+# echo "inittests: please cd to the tests/pkits directory first" >&2
+# exit 1
+# fi
+#fi
if [ "$1" = "--clean" ]; then
if [ -d private-keys-v1.d ]; then
@@ -58,12 +58,13 @@
exit 1
fi
-if ! bunzip2 -c PKITS_data.tar.bz2 | tar xf - ; then
+if test -f PKITS_data.tar.bz2; then
+ if ! bunzip2 -c PKITS_data.tar.bz2 | tar xf - ; then
echo "inittests: failed to untar the test data" >&2
exit 1
-fi
+ fi
+fi
-
# A stamp file used with --clean
echo gnupg-test-pkits-directory > testdir.stamp
More information about the Gnupg-commits
mailing list