X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7ea9a33f3b12c4fc2c5907dd22a74c1441d2855d..f1886bb2808a471b18e1416e0f821d08850d116e:/tests/conflicts.at?ds=inline

diff --git a/tests/conflicts.at b/tests/conflicts.at
index 427cce37..ee5fd026 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 */
 ]])
 
@@ -54,8 +54,10 @@ AT_DATA([input.y],
 [[
 %{
 #include <config.h>
-/* We don't need a perfect malloc for these tests. */
+/* We don't need perfect functions for these tests. */
 #undef malloc
+#undef memcmp
+#undef realloc
 #include <stdio.h>
 
 #if STDC_HEADERS
@@ -103,7 +105,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,7 +143,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
+AT_CHECK([bison -o input.c --report=all input.y], 0, [],
 [input.y: warning: 1 shift/reduce conflict
 ])
 
@@ -249,7 +251,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], [],
@@ -371,7 +373,7 @@ id : '0';
 %%
 ]])
 
-AT_CHECK([bison input.y -o input.c --report=all], 0, [],
+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'
 ]])
@@ -488,7 +490,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 1, [],
+AT_CHECK([bison -o input.c input.y], 1, [],
 [input.y: warning: 1 shift/reduce conflict
 input.y: expected 0 shift/reduce conflicts
 ])
@@ -508,7 +510,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
 
 
@@ -525,7 +527,7 @@ AT_DATA([input.y],
 exp: exp OP exp | NUM;
 ]])
 
-AT_CHECK([bison input.y -o input.c], 1, [],
+AT_CHECK([bison -o input.c input.y], 1, [],
 [input.y: warning: 1 shift/reduce conflict
 input.y: expected 2 shift/reduce conflicts
 ])