X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/fc51acddb45242904128a7637dc2ab9216ba0662..952416114729b95209dccfc4edacfc1ff13b4e82:/tests/conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 0dea0f89..d320442d 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,6 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002-2005, 2007-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2005, 2007-2015 Free Software Foundation, Inc.
 
 # 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
@@ -393,10 +393,10 @@ AT_CLEANUP
 ## parse.error=verbose and consistent errors.  ##
 ## ------------------------------------------- ##
 
-AT_SETUP([[parse.error=verbose and consistent errors]])
-
 m4_pushdef([AT_CONSISTENT_ERRORS_CHECK], [
 
+AT_SETUP([[parse.error=verbose and consistent errors: ]$1])
+
 AT_BISON_OPTION_PUSHDEFS([$1])
 
 m4_pushdef([AT_YYLEX_PROTOTYPE],
@@ -483,7 +483,11 @@ m4_popdef([AT_EXPECTING])
 m4_popdef([AT_YYLEX_PROTOTYPE])
 AT_BISON_OPTION_POPDEFS
 
-])
+AT_CLEANUP
+]) dnl AT_CONSISTENT_ERRORS_CHECK
+
+
+
 
 m4_pushdef([AT_PREVIOUS_STATE_GRAMMAR],
 [[%nonassoc 'a';
@@ -653,7 +657,6 @@ m4_popdef([AT_USER_ACTION_INPUT])
 
 m4_popdef([AT_CONSISTENT_ERRORS_CHECK])
 
-AT_CLEANUP