From: Eric Blake <eblake@redhat.com>
Date: Mon, 13 Sep 2010 16:02:50 +0000 (-0600)
Subject: tests: skip broken automake wrapper on MirBSD
X-Git-Tag: v2.68~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8e7417c137aa0535754b2e8ce5f5cbae2e6a7c0;p=thirdparty%2Fautoconf.git

tests: skip broken automake wrapper on MirBSD

On a fresh default install, MirBSD ships with an automake wrapper
script that has bad behavior:

$ automake --version; echo $?
Provide an AUTOMAKE_VERSION environment variable, please
0

* tests/tools.at (autom4te preselections): Skip, rather than fail,
if 'automake --version' succeeds without printing a version when
an environment variable is not set.
* tests/torture.at (Configuring subdirectories)
(Unusual Automake input files): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 5a2715cb..1186ca74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-13  Eric Blake  <eblake@redhat.com>
+
+	tests: skip broken automake wrapper on MirBSD
+	* tests/tools.at (autom4te preselections): Skip, rather than fail,
+	if 'automake --version' succeeds without printing a version when
+	an environment variable is not set.
+	* tests/torture.at (Configuring subdirectories)
+	(Unusual Automake input files): Likewise.
+
 2010-09-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	doc: minor indexing update.
diff --git a/tests/tools.at b/tests/tools.at
index 167d68a8..bd50a643 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1164,8 +1164,9 @@ AT_SETUP([autom4te preselections])
 # If this test should run on FAT file systems and older w32,
 # then setting $sleep correctly needs to be revisited.
 
-# We use aclocal and automake.
-AT_CHECK([automake --version || exit 77], [], [ignore], [ignore])
+# We use aclocal and automake.  Skip broken automake wrappers.
+AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
 AT_CHECK([test ! -f $HOME/.autom4te.cfg || exit 77], [], [ignore], [ignore])
 
 AT_DATA([configure.in],
diff --git a/tests/torture.at b/tests/torture.at
index 566a4513..7fd85a26 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1429,8 +1429,10 @@ AT_KEYWORDS(autoreconf)
 
 # We use aclocal (via autoreconf).
 AT_CHECK([aclocal --version || exit 77], [], [stdout], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
+
 # It should understand configure.ac.
-AT_CHECK([[grep '[^0-9]1.[01234][^0-9]' stdout && exit 77]], [1], [ignore])
+AT_CHECK([[grep '[^0-9]1\.[01234][^0-9]' stdout && exit 77]], [1], [ignore])
 
 # Set CONFIG_SITE to a nonexistent file, so that there are
 # no worries about nonstandard values for 'prefix'.
@@ -1809,7 +1811,8 @@ AT_SETUP([Unusual Automake input files])
 AT_KEYWORDS([autoreconf])
 
 # We use aclocal and automake via autoreconf.
-AT_CHECK([automake --version || exit 77], [], [ignore], [ignore])
+AT_CHECK([automake --version || exit 77], [], [stdout], [ignore])
+AT_CHECK([[grep '[1-9]\.[0-9][0-9]*' stdout || exit 77]], [], [ignore])
 
 AT_DATA([configure.in],
 [[AC_INIT(GNU foo, 1.0)