rw.rs ~charadon -- gnu-hello

gnu-hello

Info

Commit...:	809929d4bc504ef60c3d99cb6da55789eec456da
Author...:	Reuben Thomas
Committer:	Reuben Thomas
Date.....:	Wed May 1 13:32:27 2013 +0100
Parents..:	f62af3bec91791ab48403ad60a100fb4dd7ec135

Message

Use parallel tests harness, to fix make check with newer automake.

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

Changes

diff --git a/configure.ac b/configure.ac
line changes: +2/-2
index ac96f43..7a5bec0
--- a/configure.ac
+++ b/configure.ac

@@ -12,10 +12,10 @@ AC_INIT([GNU Hello], [2.8], [bug-hello@gnu.org])
 
 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
line changes: +9/-4
index 4ae8119..413b639
--- 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;