* tests/torture.at (Unusual Automake input files): Skip if we

detect automake < 1.8.

diff --git a/ChangeLog b/ChangeLog
index dd904894ed0dc9c7e01e188e109cbaa1401b5c29..37aef9efead6708fd4c4f664393dc08db2bdb2c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/torture.at (Unusual Automake input files): Skip if we
+       detect automake < 1.8.
+
 2006-05-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/autoconf/c.m4 (AC_PROG_CC_STDC): If ac_cv_prog_cc_stdc

diff --git a/tests/torture.at b/tests/torture.at
index 9ea29fbb372a503087ac5e5dd118352522e2aff8..919fca8e4d4ec5dba0e67bf3a732a3a9f3a583fe 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1004,10 +1004,11 @@ AC_OUTPUT
 
 AT_DATA([HeeHee.am],
 [[# Humans do no worse than `GNUmakefile.am'.
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.8
 ]])
 
-AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [ignore])
+AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr],
+        [AT_CHECK([grep 'require.*1\.8' stderr && exit 77], [1])])
 AT_CHECK([test -f HeeHee.in])
 
 AT_CLEANUP