Merge branch 'maint'

[bison.git] / tests / testsuite.at

diff --git a/tests/testsuite.at b/tests/testsuite.at
index d00c3c9ef263efdf610bbdf5a0424878e401816d..48133b72e80cffbb09676840b09f8bf31d680ced 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,36 +1,28 @@
-# Test suite for GNU Bison.                            -*- Autotest -*-
+# Test suite for GNU Bison.                             -*- Autotest -*-
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software
+# Copyright (C) 2000-2004, 2006-2007, 2009-2012 Free Software
 # Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Bison often leaks memory when its exit status is non-zero, so set
-# --leak-check=summary for Valgrind in that case.
-m4_pushdef([ORIGINAL_AT_CHECK], m4_defn([AT_CHECK]))
-m4_pushdef([AT_CHECK],
-[ORIGINAL_AT_CHECK(
-   m4_if(m4_index(m4_quote($1), [bison ]), 0,
-        m4_if(m4_quote($2), [0], [], m4_quote($2), [], [],
-              [[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS; ]]))$@)])
 
 # Testing resistance to user bugs.
 m4_include([input.at])
 
+# Testing named references.
+m4_include([named-refs.at])
+
 # Testing output file names.
 m4_include([output.at])
 
@@ -71,11 +63,14 @@ m4_include([regression.at])
 # Some C++ specific tests.
 m4_include([c++.at])
 
+# And some Java specific tests.
+m4_include([java.at])
+
 # GLR tests:
 # C++ types, simplified
 m4_include([cxx-type.at])
 # Regression tests
 m4_include([glr-regression.at])
 
-m4_popdef([AT_CHECK])
-m4_popdef([ORIGINAL_AT_CHECK])
+# Push parsing specific tests.
+m4_include([push.at])