From 0a8cfb4c59d2523ecd7a8f253afce8f8e436594f Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 21 Dec 2011 19:13:17 +0100 Subject: [PATCH] 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. --- ChangeLog | 24 ++++++++++++++++++++++++ tests/lex-clean-cxx.test | 7 ------- tests/lex-clean.test | 7 ------- tests/yacc-clean-cxx.test | 4 ---- tests/yacc-clean.test | 7 ------- tests/yacc-nodist.test | 5 +++-- tests/yflags-force-override.test | 2 -- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index aeb8da8bd..0bebdbdce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2011-12-27 Stefano Lattarini + + 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 Merge branch 'maint' into 'yacc-work' diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test index 3f566c466..ba7e36708 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 dd36f8047..5bcb5c177 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 96ceaf896..81d43e7e5 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 bdc8dd05c..156d60387 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-nodist.test b/tests/yacc-nodist.test index 846e247c6..8eef6d4b5 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 7a3197fcd..3cc5cccb8 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 - : -- 2.47.2