yacc tests: fix bug in 'yacc-cxx.test'

* tests/yacc-cxx.test: Enable `errexit' shell flag (the lack of
which was masking the bug).
(bar.cxx): Rename to ...
(bar2.cxx): ... this, otherwise automake will (correctly) complain
that object `bar.o' is created by both `bar.cxx' and `bar.c++'.
(Makefile.am): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 0553c958587fc2a15d08284a35754caa5e76cd82..1d1ceacdfcc4a97e4f3394339775a039c2003ad5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-28   Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       yacc tests: fix bug in 'yacc-cxx.test'
+       * tests/yacc-cxx.test: Enable `errexit' shell flag (the lack of
+       which was masking the bug).
+       (bar.cxx): Rename to ...
+       (bar2.cxx): ... this, otherwise automake will (correctly) complain
+       that object `bar.o' is created by both `bar.cxx' and `bar.c++'.
+       (Makefile.am): Adjust.
+
 2011-06-28   Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        lex tests: fix spurious link errors on Solaris

diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
index eacf62884ab0b1001870452dc7c9aa79eea98d98..e4afd954376a84776a6c85dd78011f4b6afe8ec8 100755 (executable)
--- a/tests/yacc-cxx.test
+++ b/tests/yacc-cxx.test
@@ -21,6 +21,8 @@
 required=yacc
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CXX
 AC_PROG_YACC
@@ -32,7 +34,7 @@ bin_PROGRAMS = foo1 foo2 foo3 foo4
 foo1_SOURCES = parse1.yy  foo.cc
 foo2_SOURCES = parse2.y++ bar.c++
 foo3_SOURCES = parse3.yxx foo.cc
-foo4_SOURCES = parse4.ypp bar.cxx
+foo4_SOURCES = parse4.ypp bar2.cxx
 foo3_YFLAGS = -v
 foo4_YFLAGS = $(foo3_YFLAGS)
 
@@ -67,7 +69,7 @@ int main (int argc, char **argv)
 }
 END
 cp foo.cc bar.c++
-cp foo.cc bar.cxx
+cp foo.cc bar2.cxx
 
 $ACLOCAL
 $AUTOCONF