* doc/Doxyfile.in: New.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 381b49ef99659214d1ef9ceb37661946b75d966e..1cbf23acb0f39c9eea5b7faf50ee669256a2d3d1 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1,6 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 

-# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005 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
 
 # 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


@@ -14,8 +14,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 
 # 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.

 
 AT_BANNER([[Conflicts.]])
 
 
 AT_BANNER([[Conflicts.]])
 


@@ -62,7 +62,6 @@ static void
 yyerror (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
 yyerror (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);

-  exit (1);

 }
 
 /* The current argument. */
 }
 
 /* The current argument. */


@@ -483,9 +482,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 0, [],
+AT_CHECK([bison -o input.c input.y], 1, [],

 [input.y: conflicts: 1 shift/reduce
 [input.y: conflicts: 1 shift/reduce

-input.y: warning: expected 0 shift/reduce conflicts
+input.y: expected 0 shift/reduce conflicts

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP
 


@@ -520,9 +519,9 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
 exp: exp OP exp | NUM;
 ]])
 

-AT_CHECK([bison -o input.c input.y], 0, [],
+AT_CHECK([bison -o input.c input.y], 1, [],

 [input.y: conflicts: 1 shift/reduce
 [input.y: conflicts: 1 shift/reduce

-input.y: warning: expected 2 shift/reduce conflicts
+input.y: expected 2 shift/reduce conflicts

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP
 


@@ -540,9 +539,9 @@ program: a 'a' | a a;
 a: 'a';
 ]])
 
 a: 'a';
 ]])
 

-AT_CHECK([bison -o input.c input.y], 0, [],
+AT_CHECK([bison -o input.c input.y], 1, [],

 [input.y: conflicts: 1 reduce/reduce
 [input.y: conflicts: 1 reduce/reduce

-input.y: warning: expected 0 reduce/reduce conflicts
+input.y: expected 0 reduce/reduce conflicts

 ])
 AT_CLEANUP
 
 ])
 AT_CLEANUP