[Automake-commit] [SCM] GNU Automake branch, yacc-work, updated. v1.11-627-g1560265

[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=1560265e1ca8d5c542d27a4143e1879379831e12

The branch, yacc-work has been updated
       via  1560265e1ca8d5c542d27a4143e1879379831e12 (commit)
       via  0a8cfb4c59d2523ecd7a8f253afce8f8e436594f (commit)
      from  a9edac6c6e0c33d6571d6ef5ce0bbf682459c3bc (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 1560265e1ca8d5c542d27a4143e1879379831e12
Author: Stefano Lattarini <address@hidden>
Date:   Tue Dec 27 21:28:21 2011 +0100

    yacc/lex tests: remove an unneeded workaround for bug#8485
    
    * tests/yacc-d-cxx.test: Remove the workaround previously required
    to avoid spurious failures due to automake bug#8485: that bug has
    been solved with commit `v1.11-512-g40c3432'.

commit 0a8cfb4c59d2523ecd7a8f253afce8f8e436594f
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 21 19:13:17 2011 +0100

    yacc/lex tests: avoid too much failures with FreeBSD make
    
    In various Yacc/Lex tests, we used to run "make distcheck" commands
    whose value was mostly dubious, and, even when it was there, was
    very, very little.  The presence of these extra distchecks had two
    disadvantages: it slowed down our already-too-slow testsuite even
    more, and, much worse, caused a lot of extra failures with FreeBSD,
    all due to automake bug#7884, which is already exposed by the test
    case `yacc-dist-nobuild.test'.
    
    We can improve this situation by simply removing "make distcheck"
    calls from a few testcases, or making them conditional to the use
    of GNU make.
    
    * tests/lex-clean-cxx.test: Do not call "make distcheck".
    * tests/lex-clean.test: Likewise.
    * tests/yacc-clean-cxx.test: Likewise.
    * tests/yacc-clean.test: Likewise.
    * tests/yflags-force-override.test: Likewise.
    * tests/yacc-nodist.test: Only run "make distcheck" if make
    is GNU make.

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

Summary of changes:
 ChangeLog                        |   32 ++++++++++++++++++++++++++++++++
 tests/lex-clean-cxx.test         |    7 -------
 tests/lex-clean.test             |    7 -------
 tests/yacc-clean-cxx.test        |    4 ----
 tests/yacc-clean.test            |    7 -------
 tests/yacc-d-cxx.test            |    9 ---------
 tests/yacc-nodist.test           |    5 +++--
 tests/yflags-force-override.test |    2 --
 8 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aeb8da8..c0d1f30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       yacc/lex tests: remove an unneeded workaround for bug#8485
+
+       * tests/yacc-d-cxx.test: Remove the workaround previously required
+       to avoid spurious failures due to automake bug#8485: that bug has
+       been solved with commit `v1.11-512-g40c3432'.
+
+2011-12-27  Stefano Lattarini  <address@hidden>
+
+       yacc/lex tests: avoid too much failures with FreeBSD make
+
+       In various Yacc/Lex tests, we used to run "make distcheck" commands
+       whose value was mostly dubious, and, even when it was there, was
+       very, very little.  The presence of these extra distchecks had two
+       disadvantages: it slowed down our already-too-slow testsuite even
+       more, and, much worse, caused a lot of extra failures with FreeBSD,
+       all due to automake bug#7884, which is already exposed by the test
+       case `yacc-dist-nobuild.test'.
+
+       We can improve this situation by simply removing "make distcheck"
+       calls from a few testcases, or making them conditional to the use
+       of GNU make.
+
+       * tests/lex-clean-cxx.test: Do not call "make distcheck".
+       * tests/lex-clean.test: Likewise.
+       * tests/yacc-clean-cxx.test: Likewise.
+       * tests/yacc-clean.test: Likewise.
+       * tests/yflags-force-override.test: Likewise.
+       * tests/yacc-nodist.test: Only run "make distcheck" if make
+       is GNU make.
+
 2011-12-15  Stefano Lattarini  <address@hidden>
 
        Merge branch 'maint' into 'yacc-work'
diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
index 3f566c4..ba7e367 100755
--- a/tests/lex-clean-cxx.test
+++ b/tests/lex-clean-cxx.test
@@ -121,11 +121,4 @@ test -f parsebar.ll
 test ! -r parsefoo.cxx
 test ! -r bar-parsebar.cc
 
-cp config.sav config.status
-./config.status # re-create Makefile
-
-# The distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
-
 :
diff --git a/tests/lex-clean.test b/tests/lex-clean.test
index dd36f80..5bcb5c1 100755
--- a/tests/lex-clean.test
+++ b/tests/lex-clean.test
@@ -104,11 +104,4 @@ test -f lexer.l
 test ! -r lexer.c
 test ! -r bar-lexer.c
 
-cp config.sav config.status
-./config.status # re-create Makefile
-
-# The distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
-
 :
diff --git a/tests/yacc-clean-cxx.test b/tests/yacc-clean-cxx.test
index 96ceaf8..81d43e7 100755
--- a/tests/yacc-clean-cxx.test
+++ b/tests/yacc-clean-cxx.test
@@ -162,8 +162,4 @@ test ! -r sub2/bar-parsebar.hh
 cp config.sav config.status
 ./config.status # re-create Makefile
 
-# The distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
-
 :
diff --git a/tests/yacc-clean.test b/tests/yacc-clean.test
index bdc8dd0..156d603 100755
--- a/tests/yacc-clean.test
+++ b/tests/yacc-clean.test
@@ -146,11 +146,4 @@ test ! -r sub2/parse.h
 test ! -r sub2/bar-parse.c
 test ! -r sub2/bar-parse.h
 
-cp config.sav config.status
-./config.status # re-create Makefile
-
-# The distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
-
 :
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index 599b6ca..1308c18 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -84,15 +84,6 @@ $AUTOCONF
 
 cp $testsrcdir/../lib/ylwrap .
 
-# FIXME: temporary workaround (taken from the automake manual) for
-#        automake bug#8485.  Remove once that bug is fixed.
-cat >> Makefile.am <<'END'
-AUTOMAKE_OPTIONS = -Wno-override
-distcleancheck_listfiles = \
-       find ./baz -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
-            sh '{}' ';'
-END
-
 $AUTOMAKE Makefile
 
 # Try with -d in $(YFLAGS) (don't do this in real life!).
diff --git a/tests/yacc-nodist.test b/tests/yacc-nodist.test
index 846e247..8eef6d4 100755
--- a/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@ -99,7 +99,8 @@ $MAKE test-build
 $MAKE test-dist
 
 # But the distribution must work correctly, assuming the user has
-# the proper tools to process yacc files.
-$MAKE distcheck
+# the proper tools to process yacc files.  Do this check only with
+# GNU make, to avoid tripping on automake bug#7884.
+if using_gmake; then $MAKE distcheck; fi
 
 :
diff --git a/tests/yflags-force-override.test b/tests/yflags-force-override.test
index 7a3197f..3cc5ccc 100755
--- a/tests/yflags-force-override.test
+++ b/tests/yflags-force-override.test
@@ -61,6 +61,4 @@ test -f foo.c
 test -f foo.h
 test -f foo.output
 
-$MAKE distcheck
-
 :


hooks/post-receive
-- 
GNU Automake