Merge branch 'master' into ng/master

* master:
  NEWS: one more minor fixlet
  maint: port check-minimal-autoconf to VPATH builds
  tests: avoid spurious failures in Linux -> MinGW cross-compilation mode
  tests: simplify checks for some expected variables values in Makefiles
  NEWS: improve and update wording
  tests: fix/improve few heading comments
  coverage: new test on Texinfo @include support
  tests: tighten a grepping check
  tests: more significant names for some tests
  rename-tests: rework some code for clarity and safety
  tests: cosmetic changes in t/extra-sources.sh
  rename-tests: inform the user about the pre-filled commit msg
  typofix: in comments in 'maintainer/rename-tests'
  rename-tests: also "git add" list-of-tests.mk
  tests: rename t/exsource.sh -> t/extra-sources.sh

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

1 files changed, 68 insertions, 0 deletions

diff --git a/t/yflags-cxx.sh b/t/yflags-cxx.sh
new file mode 100644
index 000000000..46a13c889
--- /dev/null
+++ b/t/yflags-cxx.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Check that $(YFLAGS) takes precedence over both $(AM_YFLAGS) and
+# $(foo_YFLAGS).  This is the C++ case.
+# Please keep this in sync with the sister tests:
+#  - yflags.sh
+#  - lflags.sh
+#  - lflags-cxx.sh
+
+. test-init.sh
+
+cat >fake-yacc <<'END'
+#!/bin/sh
+echo '/*' "$*" '*/' >y.tab.c
+echo 'extern int dummy;' >> y.tab.c
+END
+chmod a+x fake-yacc
+
+cat >> configure.ac <<'END'
+AC_SUBST([CXX], [false])
+# Simulate presence of Yacc using our fake-yacc script.
+AC_SUBST([YACC], ['$(abs_top_srcdir)'/fake-yacc])
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+AUTOMAKE_OPTIONS = no-dependencies
+bin_PROGRAMS = foo bar
+foo_SOURCES = main.cc foo.yy
+bar_SOURCES = main.cc bar.y++
+AM_YFLAGS = __am_flags__
+bar_YFLAGS = __bar_flags__
+END
+
+$ACLOCAL
+$AUTOMAKE -a
+
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && exit 1
+
+: > foo.yy
+: > bar.y++
+
+$AUTOCONF
+./configure
+$MAKE foo.cc bar-bar.c++ YFLAGS=__user_flags__
+
+cat foo.cc
+cat bar-bar.c++
+
+grep '__am_flags__.*__user_flags__' foo.cc
+grep '__bar_flags__.*__user_flags__' bar-bar.c++
+
+: