build: enable parallel tests harness from Automake

This way, we'll be able to run test cases in parallel (useful
on multicore systems), and output from test cases will be
saved in log files, which should simplify debugging and bug
reporting.

* configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
Require Automake 1.11.1 or later, so that the 'parallel-tests'
will be certainly available.
(AC_INIT): Require Autoconf 2.62 or later; that is the minimal
version supported by Automake 1.11.1 or later.
* gettext-runtime/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* autogen.sh: Update version number requirement for Autoconf.
* gettext-tools/tests/Makefile.am (TESTS_ENVIRONMENT): Remove
trailing '$(SHELL)'.  With the parallel-tests harness, this is
no longer the correct way to define a custom test runner for
the test scripts; to do so, we have to ...
(LOG_COMPILER): ... define this to $(SHELL).

Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 22e1dc675b57fc37fe945318c24ffe4d6e075177..9cbd5ce84fc32614f99338144a52df064f74d0f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
+       Require Automake 1.11.1 or later, so that the 'parallel-tests'
+       will be certainly available.
+       (AC_INIT): Require Autoconf 2.62 or later; that is the minimal
+       version supported by Automake 1.11.1 or later.
+       * autogen.sh: Update version number requirement for Autoconf.
+
 2013-05-20  Pavel Kharitonov  <ineiev@gnu.org>  (tiny change)
 
        Add --previous option to msgattrib.

diff --git a/autogen.sh b/autogen.sh
index 23e957dcc83216f6fb7ab1ae26712f45eaee10c2..39285cefb8ca6692083a9f5fb47fef562963455c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.60..2.69 and automake-1.11.1..1.12 in the
+# This script requires autoconf-2.62..2.69 and automake-1.11.1..1.12 in the
 # PATH.
 # It also requires either
 #   - the GNULIB_TOOL environment variable pointing to the gnulib-tool script

diff --git a/configure.ac b/configure.ac
index 7c8d2c04180aa7e43292a6c306f4fd9dfd5eb8d6..fcff9e70d077d9eef854a50b559ec9fccfb13bd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,13 +16,13 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.62])
 AC_INIT
 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 . $srcdir/version.sh
 gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE([silent-rules])
+AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
 
 dnl Override automake's tar command used for creating distributions.
 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index b523cfdfd79f94f858793afd00c841195b848b5d..2bbcf14ae2cc5d56ac0d4ac75c4cb548e610a778 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
+       Require Automake 1.11.1 or later, so that the 'parallel-tests'
+       will be certainly available.
+       (AC_INIT): Require Autoconf 2.62 or later; that is the minimal
+       version supported by Automake 1.11.1 or later.
+
 2012-12-27  Daiki Ueno  <ueno@gnu.org>
 
        * configure.ac (WOE32DLL): New conditional.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index e300c733eae01e9b687bee357c98345029179e5b..8b04c2b4439d54da5b939fa3b003a02caba8705a 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -16,14 +16,14 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.62])
 AC_INIT
 AC_CONFIG_SRCDIR([intl/dcigettext.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE([silent-rules])
-AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 76cfa04482c0402edf25b8aa5f2e6368962db41f..13dd874412460a8c3eb381a1a0e6252413ab5fad 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
+       Require Automake 1.11.1 or later, so that the 'parallel-tests'
+       will be certainly available.
+       (AC_INIT): Require Autoconf 2.62 or later; that is the minimal
+       version supported by Automake 1.11.1 or later.
+
 2013-04-26  Daiki Ueno  <ueno@gnu.org>
 
        Support for Python brace format.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 373d3cc8170e6d4377009496c4e1eac7453e5650..1a522bbb70e630c2e7fe5d84afafebbfa1528477 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -16,14 +16,14 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.62])
 AC_INIT
 AC_CONFIG_SRCDIR([src/msgfmt.c])
 AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
 gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
-AM_INIT_AUTOMAKE([silent-rules])
-AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 055c2d700671a65e2bf0a7f7a261ea20e1281d9e..93a33f7d2254b003c1b9d52a305032b2c9d24f11 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>  (tiny change)
+
+       * Makefile.am (TESTS_ENVIRONMENT): Remove $(SHELL).
+       (LOG_COMPILER): Define to $(SHELL).
+
 2013-05-29  Daiki Ueno  <ueno@gnu.org>
 
        Avoid temp file name collisions in test scripts.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index f2c48488a7c24be97c8c7b1024108f2126e859eb..423804ed2bbba20045fe1be09413f7cb6b1e49f0 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -195,8 +195,9 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
                    LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
                    LOCALE_JA='@LOCALE_JA@' \
                    host_os='@host_os@' \
-                   CONFIG_SHELL='$(SHELL)' \
-                   $(SHELL)
+                   CONFIG_SHELL='$(SHELL)'
+
+LOG_COMPILER = $(SHELL)
 
 # Update the expected test results.
 update-expected: xg-c-1.ok.po