X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e8832397ea06de8049828011aff948b5302ffe66..dda7a53e4d98add4c5ab9ba2cbc6a2bbf40e896c:/tests/conflicts.at?ds=sidebyside

diff --git a/tests/conflicts.at b/tests/conflicts.at
index d0da937b..dbc9be58 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -37,7 +37,7 @@ exp: e 'e';
 e: 'e' | /* Nothing. */;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 0, [],
+AT_CHECK([bison -o input.c input.y], 0, [],
 [[input.y:4.8: warning: rule never reduced because of conflicts: e: /* empty */
 ]])
 
@@ -50,12 +50,9 @@ AT_CLEANUP
 
 AT_SETUP([%nonassoc and eof])
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [[
 %{
-#include <config.h>
-/* We don't need a perfect malloc for these tests. */
-#undef malloc
 #include <stdio.h>
 
 #if STDC_HEADERS
@@ -103,7 +100,7 @@ main (int argc, const char *argv[])
 ]])
 
 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
 AT_COMPILE([input])
 
 AT_PARSER_CHECK([./input '0<0'])
@@ -141,8 +138,8 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[input.y contains 1 shift/reduce conflict.
+AT_CHECK([bison -o input.c --report=all input.y], 0, [],
+[input.y: warning: 1 shift/reduce conflict
 ])
 
 # Check the contents of the report.
@@ -249,7 +246,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all])
+AT_CHECK([bison -o input.c --report=all input.y])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
@@ -328,6 +325,7 @@ state 5
     1    | exp OP exp .  [$end, OP]
 
     $default  reduce using rule 1 (exp)
+
     Conflict between rule 1 and token OP resolved as reduce (%left OP).
 ]])
 
@@ -370,14 +368,19 @@ id : '0';
 %%
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
-[[input.y contains 1 reduce/reduce conflict.
+AT_CHECK([bison -o input.c --report=all input.y], 0, [],
+[[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
@@ -482,9 +485,9 @@ AT_DATA([input.y],
 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
+AT_CHECK([bison -o input.c input.y], 1, [],
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 0 shift/reduce conflicts
 ])
 AT_CLEANUP
 
@@ -502,7 +505,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
 AT_CLEANUP
 
 
@@ -519,8 +522,8 @@ AT_DATA([input.y],
 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
+AT_CHECK([bison -o input.c input.y], 1, [],
+[input.y: warning: 1 shift/reduce conflict
+input.y: expected 2 shift/reduce conflicts
 ])
 AT_CLEANUP