Re: [bug-gettext] [PATCH] build: enable parallel tests harness from Automake

[Daiki Ueno]

Hi Stefano,

Stefano Lattarini <address@hidden> writes:

> * 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).

Now that $(SHELL) at the end of TEST_ENVIRONMENT started signalling
error with Automake 1.13, we need this change.  However, I'm still not
sure if 'parallel-tests' option is safe.  Last time I tested it with
earlier Automake versions, it caused some errors with conflicting temp
file names.

So, I'm going to install LOG_COMPILER change only at the moment (patch
attached).  Is it fine with you?

Regards,
-- 
Daiki Ueno

>From e26d7fde591a53863879480a250e9050a9d3d720 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 14 Dec 2012 18:11:38 +0100
Subject: [PATCH] build: define LOG_COMPILER to support Automake 1.13

* configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.11.1 or later,
so that the LOG_COMPILER 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).
---
 ChangeLog                       | 8 ++++++++
 autogen.sh                      | 2 +-
 configure.ac                    | 4 ++--
 gettext-runtime/ChangeLog       | 7 +++++++
 gettext-runtime/configure.ac    | 6 +++---
 gettext-tools/ChangeLog         | 7 +++++++
 gettext-tools/configure.ac      | 6 +++---
 gettext-tools/tests/ChangeLog   | 5 +++++
 gettext-tools/tests/Makefile.am | 5 +++--
 9 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22e1dc6..6c38cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-14  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.11.1 or
+       later, so that the LOG_COMPILER 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  <address@hidden>  (tiny change)
 
        Add --previous option to msgattrib.
diff --git a/autogen.sh b/autogen.sh
index 23e957d..39285ce 100755
--- 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 7c8d2c0..9bacc94 100644
--- 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])
 
 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 b523cfd..36c1a17 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-14  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.11.1 or
+       later, so that the LOG_COMPILER 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  <address@hidden>
 
        * configure.ac (WOE32DLL): New conditional.
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index e300c73..de6aeb1 100644
--- 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])
+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 76cfa04..4dcc57e 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-14  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       * configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.11.1 or
+       later, so that the LOG_COMPILER 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  <address@hidden>
 
        Support for Python brace format.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 373d3cc..ee744ac 100644
--- 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])
+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 721c29a..608cae3 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-14  Stefano Lattarini  <address@hidden>  (tiny change)
+
+       * Makefile.am (TESTS_ENVIRONMENT): Remove $(SHELL).
+       (LOG_COMPILER): Define to $(SHELL).
+
 2013-05-12  Daiki Ueno  <address@hidden>
 
        * xgettext-javascript-4: Add a test for normal escape sequences.
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index f2c4848..423804e 100644
--- 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
-- 
1.8.2.1