Update.

[bison.git] / tests / conflicts.at

diff --git a/tests/conflicts.at b/tests/conflicts.at
index d0da937bfb1718cd7e0c7ad8363f7e7e702e067a..6f0a971f3ff66623a59db975228d861f3b4795bf 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -142,7 +142,7 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[input.y contains 1 shift/reduce conflict.
+[input.y: warning: 1 shift/reduce conflict
 ])
 
 # Check the contents of the report.
@@ -371,13 +371,18 @@ id : '0';
 ]])
 
 AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[[input.y contains 1 reduce/reduce conflict.
+[[input.y: warning: 1 reduce/reduce conflict
 input.y:4.4-8: warning: rule never reduced because of conflicts: id: '0'
 ]])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
-[[State 1 contains 1 reduce/reduce conflict.
+[[Rules never reduced
+
+    4 id: '0'
+
+
+State 1 contains 1 reduce/reduce conflict.
 
 
 Grammar
@@ -483,8 +488,8 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y contains 1 shift/reduce conflict.
-expected 0 shift/reduce conflicts
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 0 shift/reduce conflicts
 ])
 AT_CLEANUP
 
@@ -520,7 +525,7 @@ exp: exp OP exp | NUM;
 ]])
 
 AT_CHECK([bison input.y -o input.c], 1, [],
-[input.y contains 1 shift/reduce conflict.
-expected 2 shift/reduce conflicts
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 2 shift/reduce conflicts
 ])
 AT_CLEANUP