X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/a22ff96f325e8feac2ca36604ea570bebc766b2b..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/tests/Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d9b619e..64999869 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 ## Makefile for Bison testsuite.
 
-## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+## Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 ## Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -30,13 +30,13 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## ------------ ##
 
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	{					\
+	{ \
 	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])'; \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])'; \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])'; \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])'; \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \
 	} >$(srcdir)/package.m4
 
 ## ------------ ##
@@ -47,11 +47,12 @@ TESTSUITE_AT = \
 	local.at \
 	testsuite.at \
 	input.at \
-	output.at sets.at reduce.at \
+	output.at sets.at reduce.at skeletons.at \
 	synclines.at headers.at actions.at conflicts.at \
 	calc.at \
         torture.at existing.at regression.at \
         c++.at \
+        java.at \
 	cxx-type.at glr-regression.at
 
 TESTSUITE = $(srcdir)/testsuite
@@ -87,11 +88,13 @@ maintainer-check-posix: $(TESTSUITE)
 
 .PHONY: maintainer-check-valgrind
 maintainer-check-valgrind: $(TESTSUITE)
-	if test -n "$(VALGRIND)"; then					    \
-	   $(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'; \
-	else								    \
-	  true;								    \
-	fi
+	test -z '$(VALGRIND)' || \
+	   VALGRIND_OPTS='--leak-check=full --show-reachable=yes' \
+	   $(TESTSUITE) PREBISON='$(VALGRIND) -q' PREPARSER='$(VALGRIND) -q'
 
 .PHONY: maintainer-check
 maintainer-check: maintainer-check-posix maintainer-check-valgrind maintainer-check-g++
+
+.PHONY: maintainer-push-check
+maintainer-push-check:
+	BISON_USE_PUSH_FOR_PULL=1 $(MAKE) $(AM_MAKEFLAGS) maintainer-check