From 44d9fbdc2bd146c848d17c1cdde0e4297b9566ab Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 29 Dec 2012 18:58:46 +0100 Subject: [PATCH] tests: enable Automake parallel testsuite harness It is better than the older test driver. It is also the default now, starting from Automake 1.13; so having it enabled unconditionally will allow GNU sed to be seamlessly bootstrapped by Automake 1.13. * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option. Also require Automake 1.11.1, since that is the minimal version to have a sane 'parallel-tests' support. (AC_PREREQ): Bump requirement to 2.62, since that is the minimal version required by Automake 1.11.1. * testsuite/Makefile.am (TESTS_ENVIRONMENT): Remove the invocation for the test runner "$(srcdir)/runtest"; it's correct place is ... (LOG_COMPILER): ... here. Signed-off-by: Stefano Lattarini --- ChangeLog | 17 +++++++++++++++++ configure.ac | 4 ++-- testsuite/Makefile.am | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d744f86..55897b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2012-12-29 Stefano Lattarini (tiny change) + + maint: enable Automake parallel testsuite harness + It is better than the older test driver. It is also the + default now, starting from Automake 1.13; so having it + enabled unconditionally will allow GNU sed to be seamlessly + bootstrapped by Automake 1.13. + * configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option. + Also require Automake 1.11.1, since that is the minimal version + to have a sane 'parallel-tests' support. + (AC_PREREQ): Bump requirement to 2.62, since that is the + minimal version required by Automake 1.11.1. + * testsuite/Makefile.am (TESTS_ENVIRONMENT): Remove the + invocation for the test runner "$(srcdir)/runtest"; it's + correct place is ... + (LOG_COMPILER): ... here. + 2012-12-29 Stefano Lattarini (tiny change) build: avoid bootstrap failure diff --git a/configure.ac b/configure.ac index 9d33ec9..874ffa1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ AC_INIT([GNU sed], 4.2.2, bug-sed@gnu.org, sed) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) -AC_PREREQ(2.60) -AM_INIT_AUTOMAKE +AC_PREREQ(2.62) +AM_INIT_AUTOMAKE([1.11.1 parallel-tests]) SED_FEATURE_VERSION=4.2.2 AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index d80e72c..c670ee0 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -29,8 +29,9 @@ SEDTESTS += \ factor binary3 binary2 binary dc TESTS_ENVIRONMENT = MAKE="$(MAKE)" VERSION="$(VERSION)" \ - @LOCALCHARSET_TESTS_ENVIRONMENT@ $(srcdir)/runtest + @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOG_COMPILER = $(srcdir)/runtest EXTRA_DIST = \ PCRE.tests BOOST.tests SPENCER.tests \