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.

diff --git a/ChangeLog b/ChangeLog
index aeb8da8bdf027b0449737559c98fe9cb984e3e62..0bebdbdcebfa032b4ace2f7b5e31558f09059c6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2011-12-27  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        Merge branch 'maint' into 'yacc-work'

diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
index 3f566c466c68d377a58d62b9207b9e11f081e251..ba7e367083b2a5a65fa1858ff39af301bec10b13 100755 (executable)
--- 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 dd36f8047374c5797f358ed0b4e2a86f231dbd10..5bcb5c177cc678fd6ff45cb1a26d18de5dd2eb35 100755 (executable)
--- 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 96ceaf896153c16f328119b8eebfc2e05ab2e16a..81d43e7e56fff4dc72f6c52a4694ac28f601555e 100755 (executable)
--- 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 bdc8dd05c73587844f5e33719e0645efe5f32ecf..156d6038773fe14fca32f1ec8123714f162649ae 100755 (executable)
--- 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-nodist.test b/tests/yacc-nodist.test
index 846e247c680ee95cf4ade96b7161879ab60e6c56..8eef6d4b55510288be14e1e1d4f83a2c8ca38cc0 100755 (executable)
--- 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 7a3197fcdf7d3ec0cc983e531e1fcdc8794e8b2d..3cc5cccb891222fd55408f75ebe50a11056c1eca 100755 (executable)
--- 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
-
 :