From 3262c47dcfebd2dbfe79f8c885ff81fda6c0a86b Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 19 Nov 2010 19:43:28 +0100 Subject: [PATCH] help2.test: add checks on aclocal too. * tests/help2.test: Check that also `aclocal --version' and `aclocal --help' work with configure.in and acinclude.m4 both broken. --- ChangeLog | 7 +++++++ tests/help2.test | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e3618a7..a8c69a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-11-19 Stefano Lattarini + + help2.test: add checks on aclocal too. + * tests/help2.test: Check that also `aclocal --version' and + `aclocal --help' work with configure.in and acinclude.m4 both + broken. + 2010-11-17 Stefano Lattarini Fix spurious failures of silent-rules tests with Sun Fortran. diff --git a/tests/help2.test b/tests/help2.test index 5212092..b74f30a 100755 --- a/tests/help2.test +++ b/tests/help2.test @@ -15,7 +15,7 @@ # along with this program. If not, see . # Make sure --help and --version work, even when the current directory -# contains a broken configure.in. +# contains a broken configure.in and a broken acinclude.m4. . ./defs || Exit 1 set -e @@ -29,9 +29,19 @@ ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'` AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'` echo '[' > configure.in +echo '[' > acinclude.m4 $AUTOMAKE --version $AUTOMAKE --help +$ACLOCAL --version +$ACLOCAL --help + +# Sanity check: aclocal cannot work with broken acinclude.m4. +$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; } +cat stderr >&2 +$FGREP acinclude.m4 stderr + +rm -f acinclude.m4 # Sanity checks: aclocal and automake cannot work with broken configure.in. $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; } -- 2.7.4