[Pkg-gnupg-commit] [gnupg2] 30/34: build: New configure option --enable-all-tests.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Aug 11 16:51:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch upstream
in repository gnupg2.
commit fb21aa8b50367e2afa13bad73fc21d6f01a97e18
Author: Werner Koch <wk at gnupg.org>
Date: Tue Aug 8 17:28:25 2017 +0200
build: New configure option --enable-all-tests.
* configure.ac: New option --enable-all-tests.
* tests/gpgscm/ffi.c (ffi_init): New gloabl var *run-all-tests*.
* tests/openpgp/all-tests.scm (all-tests): Use that var instead
of *maintainer-mode*.
* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): Add --enable-all-tests.
--
It is better to have a separate option to run all tests than to put
this on top of --enable-maintainer-mode. This way we can also make
sure to run all tests during "make distcheck".
Signed-off-by: Werner Koch <wk at gnupg.org>
---
Makefile.am | 2 +-
README | 5 ++++-
configure.ac | 14 ++++++++++++++
tests/gpgscm/ffi.c | 8 ++++++++
tests/openpgp/all-tests.scm | 2 +-
5 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e31d67a..b972cff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gnupg-builddir-envvar \
- --enable-symcryptrun --enable-g13 \
+ --enable-all-tests --enable-symcryptrun --enable-g13 \
--enable-gpg2-is-gpg --enable-gpgtar --enable-wks-tools --disable-ntbtls
GITLOG_TO_CHANGELOG=gitlog-to-changelog
diff --git a/README b/README
index 9ade9fd..a9a3eb0 100644
--- a/README
+++ b/README
@@ -60,9 +60,12 @@
./configure
make
+ make check
make install
- (Before doing install you might need to become root.)
+ The "make check" is optional but highly recommended. To run even
+ more tests you may add "--enable-all-tests" to the configure run.
+ Before running the "make install" you might need to become root.
If everything succeeds, you have a working GnuPG with support for
OpenPGP, S/MIME, ssh-agent, and smartcards. Note that there is no
diff --git a/configure.ac b/configure.ac
index 20a6ed6..3ff5865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1668,6 +1668,20 @@ AC_ARG_ENABLE(optimization,
fi])
#
+# Configure option --enable-all-tests
+#
+AC_MSG_CHECKING([whether "make check" shall run all tests])
+AC_ARG_ENABLE(all-tests,
+ AC_HELP_STRING([--enable-all-tests],
+ [let "make check" run all tests]),
+ run_all_tests=$enableval, run_all_tests=no)
+AC_MSG_RESULT($run_all_tests)
+if test "$run_all_tests" = "yes"; then
+ AC_DEFINE(RUN_ALL_TESTS,1,
+ [Defined if "make check" shall run all tests])
+fi
+
+#
# We do not want support for the GNUPG_BUILDDIR environment variable
# in a released version. However, our regression tests suite requires
# this and thus we build with support for it during "make distcheck".
diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 4c2148a..dde5b52 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -1450,6 +1450,14 @@ ffi_init (scheme *sc, const char *argv0, const char *scriptname,
#endif
);
+ ffi_define (sc, "*run-all-tests*",
+#if RUN_ALL_TESTS
+ sc->T
+#else
+ sc->F
+#endif
+ );
+
ffi_define (sc, "*stdin*",
sc->vptr->mk_port_from_file (sc, stdin, port_input));
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index e65d527..d687fe4 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -58,7 +58,7 @@
(path-join "tests" "openpgp" name)
(in-srcdir "tests" "openpgp" name))) all-tests))
- (when *maintainer-mode*
+ (when *run-all-tests*
(set! tests
(append
tests
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list