From: Stefano Lattarini Date: Fri, 28 Dec 2012 20:40:16 +0000 (+0100) Subject: tests: a test about warnings in category 'obsolete' was failing spuriously X-Git-Tag: v1.16~157 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c0c0581bb219030092b6760e0289a63b9c3be4f;p=thirdparty%2Fautomake.git tests: a test about warnings in category 'obsolete' was failing spuriously * t/warnings-obsolete-default.sh : After our removal of $(INCLUDES) support, this test has been spuriously failing because it was assuming that a definition of the INCLUDES make variable only caused a warning rather than a fatal error. Fix it to use a definition of the newly obsolescent ACLOCAL_AMFLAGS make variable. Signed-off-by: Stefano Lattarini --- diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh index 7fbb1bc34..ac3a27d7e 100755 --- a/t/warnings-obsolete-default.sh +++ b/t/warnings-obsolete-default.sh @@ -22,16 +22,11 @@ # We want (almost) complete control over automake options. AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror" -echo AC_PROG_CC >> configure.ac - -cat > Makefile.am <<'END' -bin_PROGRAMS = foo -INCLUDES = -Ibar -END +echo ACLOCAL_AMFLAGS = > Makefile.am $ACLOCAL AUTOMAKE_fails -grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr +grep '^Makefile\.am:1:.*ACLOCAL_AMFLAGS.*deprecated' stderr # Check that we can override warnings about obsolete stuff. $AUTOMAKE -Wno-obsolete