From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 16 Sep 2012 07:40:46 +0000 (+0200)
Subject: tests: warnings in the 'obsolete' category: fix spurious failure
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d09f0e6ab7c80c82f5f61606039402d4d804b03;p=thirdparty%2Fautomake.git

tests: warnings in the 'obsolete' category: fix spurious failure

* t/warnings-obsolete-default.sh: $(INCLUDES) is no longer supported
in any way by Automake-NG, to a point that its definition will just
be ignored, but cause no warning; so, instead, use the two-argument
invocation form of AM_INIT_AUTOMAKE to elicit warnings in the 'obsolete'
category.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/warnings-obsolete-default.sh b/t/warnings-obsolete-default.sh
index fc439eab9..6f4680da9 100755
--- a/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh
@@ -22,16 +22,17 @@
 # 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
+cat > configure.ac <<'END'
+AC_INIT
+AM_INIT_AUTOMAKE([foo], [1.0])
+AC_CONFIG_FILES([Makefile])
 END
 
+: > Makefile.am
+
 $ACLOCAL
 AUTOMAKE_fails
-grep '^Makefile\.am:2:.*INCLUDES.*AM_CPPFLAGS' stderr
+grep '^configure\.ac:2:.*AM_INIT_AUTOMAKE.*arguments.*deprecated' stderr
 
 # Check that we can override warnings about obsolete stuff.
 $AUTOMAKE -Wno-obsolete