tests: avoid two spurious failures on FreeBSD

Due to the FreeBSD make bug that causes of the well-known automake
bug#7884, two of our bison-requiring tests were failing on FreeBSD.
To avoid this, simply skip the part of these tests affected by that
bug.

* t/yacc-bison-skeleton.sh: Here, using the 'yl_distcheck' function.
* t/yacc-bison-skeleton-cxx.sh: Likewise.
* t/yacc-nodist.sh: While at it, use the 'yl_distcheck' here
as well, instead of running "$MAKE distcheck" only when $MAKE
is GNU make.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index a02a25a8c0dcda350e5926813dc4f3f6bc68c942..57e00915d0543ff9a0739cbbde0132a418a63c0a 100755 (executable)
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -97,6 +97,6 @@ $MAKE
 
 # Check that distribution is self-contained, and do not require
 # bison to be built.
-env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+yl_distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
 
 :

diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index f4fdf327dc0c69e905b001e5c5cd4fdff93c2fd8..6d1ed6baac7306fc0b1bfd61113638dd2e971348 100755 (executable)
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -71,6 +71,6 @@ $MAKE
 
 # Check that distribution is self-contained, and do not require
 # bison to be built.
-env YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE -e distcheck
+yl_distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
 
 :

diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
index 2e9c7e86b55d156e03344b0e5519894240904f90..97aa8e5ff9b090026d396a7a141775a950fb144e 100755 (executable)
--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
@@ -96,9 +96,6 @@ $MAKE
 $MAKE test-build
 $MAKE test-dist
 
-# But the distribution must work correctly, assuming the user has
-# 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
+yl_distcheck
 
 :