[Automake-commit] [SCM] GNU Automake branch, yacc-work, updated. v1.11-365-g6951387

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=69513875e7847a5b6b89ffb58721daee9a49f06b

The branch, yacc-work has been updated
       via  69513875e7847a5b6b89ffb58721daee9a49f06b (commit)
       via  2f16c2e9bb84027e6b42d74f7906db5ccdcd086d (commit)
      from  395e5abd368bba4ecd6a1934ad5ceeebc73ba4b3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 69513875e7847a5b6b89ffb58721daee9a49f06b
Author: Stefano Lattarini <address@hidden>
Date:   Tue Apr 12 18:19:41 2011 +0200

    tests: fix spurious failure in test 'yacc-d-cxx.test'
    
    * tests/yacc-d-cxx.test: Create ylwrap script before calling
    automake for the first time, so that the script gets correctly
    distributed.  Add checks verifying it indeed is.

commit 2f16c2e9bb84027e6b42d74f7906db5ccdcd086d
Author: Stefano Lattarini <address@hidden>
Date:   Tue Apr 12 18:02:26 2011 +0200

    tests cosmetics: remove redundant definitions of variable $tab
    
    * tests/yacc-d-basic.test ($tab): Remove definition: it's already
    defined in `tests/defs'.
    * tests/yacc-d-cxx.test: Likewise.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |   14 ++++++++++++++
 tests/yacc-d-basic.test |    1 -
 tests/yacc-d-cxx.test   |   26 ++++++++++++++++----------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 120e385..6e522d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-04-12  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure in test 'yacc-d-cxx.test'
+       * tests/yacc-d-cxx.test: Create ylwrap script before calling
+       automake for the first time, so that the script gets correctly
+       distributed.  Add checks verifying it indeed is.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
+       tests cosmetics: remove redundant definitions of variable $tab
+       * tests/yacc-d-basic.test ($tab): Remove definition: it's already
+       defined in `tests/defs'.
+       * tests/yacc-d-cxx.test: Likewise.
+
+2011-04-12  Stefano Lattarini  <address@hidden>
+
        yacc: add some tests on bison support (still xfailing)
        Related to automake bug#7648 and PR automake/491.
        * tests/bison-skeleton-cxx.test: New test.
diff --git a/tests/yacc-d-basic.test b/tests/yacc-d-basic.test
index 6cb5e99..53132b6 100755
--- a/tests/yacc-d-basic.test
+++ b/tests/yacc-d-basic.test
@@ -23,7 +23,6 @@ required=yacc
 
 set -e
 
-tab='  '
 distdir=$me-1.0
 
 cat >> configure.in << 'END'
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index a8de6b3..4381346 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -23,7 +23,6 @@ required=yacc
 
 set -e
 
-tab='  '
 distdir=$me-1.0
 
 write_parse ()
@@ -65,28 +64,30 @@ AC_CONFIG_FILES([foo/Makefile bar/Makefile baz/Makefile 
qux/Makefile])
 AC_OUTPUT
 END
 
-cat > Makefile.am <<'END'
-SUBDIRS = foo bar baz qux
-END
-
 mkdir foo bar baz qux baz/sub
 
 # These makefiles will be extended later.
-cat > foo/Makefile.am <<'END'
+cat > Makefile.am <<'END'
 .PHONY: echo-distcom
 echo-distcom:
        @echo ' ' $(DIST_COMMON) ' '
 END
-cp foo/Makefile.am bar/Makefile.am
-cp foo/Makefile.am baz/Makefile.am
-cp foo/Makefile.am qux/Makefile.am
+cp Makefile.am foo/Makefile.am
+cp Makefile.am bar/Makefile.am
+cp Makefile.am baz/Makefile.am
+cp Makefile.am qux/Makefile.am
+
+cat >> Makefile.am <<'END'
+SUBDIRS = foo bar baz qux
+END
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE Makefile
 
 cp $testsrcdir/../lib/ylwrap .
 
+$AUTOMAKE Makefile
+
 # Try with -d in $(YFLAGS) (don't do this in real life!).
 cat >> foo/Makefile.am <<END
 bin_PROGRAMS = zardoz
@@ -156,6 +157,10 @@ test -f baz/sub/parse.h++
 test -f qux/maude-parse.cxx
 test -f qux/maude-parse.hxx
 
+# The ylwrap script must be shipped.
+$MAKE echo-distcom
+$MAKE -s echo-distcom | grep '[ /]ylwrap '
+
 # The generated C++ source and header files must be shipped.
 cd foo
 $MAKE echo-distcom
@@ -181,6 +186,7 @@ cd ..
 $MAKE distdir
 find $distdir # For debugging.
 
+test -f $distdir/ylwrap
 test -f $distdir/foo/parse.cc
 test -f $distdir/foo/parse.hh
 test -f $distdir/bar/parse.cpp


hooks/post-receive
-- 
GNU Automake