]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
tests: a test about warnings in category 'obsolete' was failing spuriously
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 28 Dec 2012 20:40:16 +0000 (21:40 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 28 Dec 2012 20:40:16 +0000 (21:40 +0100)
* 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 <stefano.lattarini@gmail.com>
t/warnings-obsolete-default.sh

index 7fbb1bc34cfcf543a4257a779cdb3ad6f18b6161..ac3a27d7e7e04483313357d2597b50c7ebff60b8 100755 (executable)
 # 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