From 0e035304b3cac2e3087ee08ed2b21ce8dcb1ab85 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 16 Feb 2012 15:21:40 +0100
Subject: [PATCH] [ng] maintcheck: fix some failures

* tests/cscope.tap: Don't use 'using_gmake', simply assume we are
indeed using GNU make.
* tests/yacc-nodist.test: Likewise.
* tests/yacc-bison-skeleton.test: Don't use "make -e".
* tests/yacc-bison-skeleton-cxx.test: Likewise.
---
 tests/cscope.tap                   | 36 ++++++++++++------------------
 tests/yacc-bison-skeleton-cxx.test |  2 +-
 tests/yacc-bison-skeleton.test     |  2 +-
 tests/yacc-nodist.test             |  5 ++---
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/tests/cscope.tap b/tests/cscope.tap
index 36adeca75..806912aa3 100755
--- a/tests/cscope.tap
+++ b/tests/cscope.tap
@@ -135,29 +135,21 @@ my_configure ()
               "$1"/configure EMACS=no --with-lispdir=/who/cares
 }
 
-if using_gmake; then
-
-  cd "$ocwd"
-  pfx="relative VPATH"
-  mkdir build
-  cd build
-  my_configure ..
-  test_cscope
-  test_cleanup
-
-  cd "$ocwd"
-  pfx="absolute VPATH"
-  mkdir build2
-  cd build2
-  my_configure "$ocwd"
-  test_cscope
-  test_cleanup
-
-else
-
-  skip_row_ 12 -r "cscope in VPATH required GNU make"
+cd "$ocwd"
+pfx="relative VPATH"
+mkdir build
+cd build
+my_configure ..
+test_cscope
+test_cleanup
 
-fi
+cd "$ocwd"
+pfx="absolute VPATH"
+mkdir build2
+cd build2
+my_configure "$ocwd"
+test_cscope
+test_cleanup
 
 cd "$ocwd"
 pfx="in-tree build"
diff --git a/tests/yacc-bison-skeleton-cxx.test b/tests/yacc-bison-skeleton-cxx.test
index 0d3c99b8a..ee5cb88d1 100755
--- a/tests/yacc-bison-skeleton-cxx.test
+++ b/tests/yacc-bison-skeleton-cxx.test
@@ -95,6 +95,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
+$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
 
 :
diff --git a/tests/yacc-bison-skeleton.test b/tests/yacc-bison-skeleton.test
index aa606585a..2b368385f 100755
--- a/tests/yacc-bison-skeleton.test
+++ b/tests/yacc-bison-skeleton.test
@@ -69,6 +69,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
+$MAKE YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' distcheck
 
 :
diff --git a/tests/yacc-nodist.test b/tests/yacc-nodist.test
index 619ed878b..7bfd886f4 100755
--- a/tests/yacc-nodist.test
+++ b/tests/yacc-nodist.test
@@ -97,8 +97,7 @@ $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
+# the proper tools to process yacc files.
+$MAKE distcheck
 
 :
-- 
2.47.2