From: Stefano Lattarini Date: Fri, 14 Dec 2012 17:11:38 +0000 (+0100) Subject: build: enable parallel tests harness from Automake X-Git-Tag: v0.18.3~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=417f0080823ae17d0f258ec08f3810cd0274e021;p=thirdparty%2Fgettext.git 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 --- diff --git a/ChangeLog b/ChangeLog index 22e1dc675..9cbd5ce84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-05-29 Stefano Lattarini (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 (tiny change) Add --previous option to msgattrib. diff --git a/autogen.sh b/autogen.sh index 23e957dcc..39285cefb 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 7c8d2c041..fcff9e70d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,13 +16,13 @@ dnl along with this program. If not, see . 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 b523cfdfd..2bbcf14ae 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,11 @@ +2013-05-29 Stefano Lattarini (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 * configure.ac (WOE32DLL): New conditional. diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index e300c733e..8b04c2b44 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -16,14 +16,14 @@ dnl along with this program. If not, see . 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 76cfa0448..13dd87441 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,11 @@ +2013-05-29 Stefano Lattarini (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 Support for Python brace format. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 373d3cc81..1a522bbb7 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -16,14 +16,14 @@ dnl along with this program. If not, see . 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 055c2d700..93a33f7d2 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2013-05-29 Stefano Lattarini (tiny change) + + * Makefile.am (TESTS_ENVIRONMENT): Remove $(SHELL). + (LOG_COMPILER): Define to $(SHELL). + 2013-05-29 Daiki Ueno Avoid temp file name collisions in test scripts. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index f2c48488a..423804ed2 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