Merge branch 'master' into ng/master

* master: (23 commits)
  fixup: delete "# serial" line in m4/amversion.in
  news: update about recent ylwrap changes and fixes
  m4: get rid of "# serial" lines
  configure: ${#param} must be supported by the shell for the testsuite
  yacc tests: fix a spurious failure with parallel make
  ylwrap: use proper quoting inside a `...` substitution
  ylwrap: don't uselessly reset the exit status in case of failure
  ylwrap: fix C++ support for Bison
  ylwrap: refactor: move loop invariant
  ylwrap: refactoring: don't rely on the file order
  tests: upgrade and fix Bison test case
  tests: fix bison input file
  ylwrap: comment changes
  ylwrap: modernize idioms
  ylwrap: rename header inclusion in generated parsers
  ylwrap: simplify the list of renamings
  ylwrap: refactor: less duplication
  news: mention fixed testsuite weaknesses
  news: bump, for future 1.12.3
  tests: verify the shell test scripts are syntactically valid
  tests: don't use C instead of C++ compiler on case-insensitive platforms
  tests: avoid spurious TAP errors on Mac OS X 10.7
  tests: fix spurious failure in aclocal7.sh on fast machines

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

1 files changed, 8 insertions, 1 deletions

diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index 905c04c15..f8ff475fe 100755
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@ -54,7 +54,14 @@ void yyerror (char *s) {}
 x : 'x' {};
 %%
 END
-cp foo/parse.y bar/parse.y
+# Using ylwrap, we actually generate y.tab.[ch].  Unfortunately, we
+# forgot to rename #include "y.tab.h" into #include "parse.h" during
+# the conversion from y.tab.c to parse.c.  This was OK when Bison was
+# not issuing such an #include (up to 2.6).
+#
+# To make sure that we perform this conversion, in bar/parse.y, use
+# y.tab.h instead of parse.c.
+sed -e 's/parse\.h/y.tab.h/' <foo/parse.y >bar/parse.y
 
 cat > foo/main.c << 'END'
 #include "parse.h"