[PATCH] tests: enable Automake parallel testsuite harness

[Stefano Lattarini]

The old serial harness is discouraged today (albeit it is not planned
to be deprecated or removed).  In addition, the parallel harness is
the default one starting with Automake 1.13, and without this change,
"make check" of GNU hello fails if it is bootstrapped with automake
1.13 or later (because of subtle incompatibilities between the parallel
and serial harnesses).

* configure.ac (AM_INIT_AUTOMAKE): Add the 'parallel-tests' option.
Also, require Automake >= 1.11.1, since that option was only introduced
in the 1.11.x, and Automake 1.11 should not be used because it suffered
from few serious bugs.
(AC_PREREQ): Require Autoconf 2.62, since that is the minimal version
required by Automake 1.11 anyway.
* tests/Makefile.am (TESTS_ENVIRONMENT): Split into ...
(AM_TESTS_ENVIRONMENT, LOG_COMPILER): ... these two, and adjust to the
slightly different APIs.

Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <address@hidden>
---
 configure.ac      |  4 ++--
 tests/Makefile.am | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ac96f43..7a5bec0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,10 +12,10 @@ AC_INIT([GNU Hello], [2.8], address@hidden)
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([readme-alpha])
+AM_INIT_AUTOMAKE([1.11.1 readme-alpha parallel-tests])
 
 # Minimum Autoconf version required.
-AC_PREREQ(2.60)
+AC_PREREQ([2.62])
 
 # Where to generate output; srcdir location.
 AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4ae8119..413b639 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
 # Makefile for hello/tests.
 #
-# Copyright 1996, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+# Copyright 1996, 2005, 2006, 2007, 2008, 2010, 2013 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +20,10 @@ TESTS = greeting-1 greeting-2 hello-1 last-1 traditional-1
 
 EXTRA_DIST = $(TESTS)
 
-TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) 
PATH=.$(PATH_SEPARATOR)../src$(PATH_SEPARATOR)$$PATH \
-                   HELLO=`echo hello|sed '$(transform)'` \
-                   $(SHELL)
+LOG_COMPILER = $(SHELL)
+
+AM_TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  PATH=.$(PATH_SEPARATOR)../src$(PATH_SEPARATOR)$$PATH \
+  HELLO=`echo hello | sed '$(transform)'`;
+  export HELLO PATH top_srcdir;
-- 
1.8.3.rc0.19.g7e6a0cc