Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-22 02:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: minor changes in the Java tests

Browse Source 
* tests/java.at (AT_CHECK_JAVA_GREP): Ignore the exit status.
* tests/javapush.at (AT_CHECK_JAVA_GREP): Be more alike the previous
one.
Formating changes.
Remove stray debugging "jj" file.
This commit is contained in:
Akim Demaille
2013-06-21 11:28:01 +02:00
parent 1d678854a4
commit d116722c54
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/java.at
View File

@@ -444,9 +444,8 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
# Check that YYParser.java contains exactly COUNT lines matching ^LINE$ # Check that YYParser.java contains exactly COUNT lines matching ^LINE$
# with grep. # with grep.
m4_define([AT_CHECK_JAVA_GREP], m4_define([AT_CHECK_JAVA_GREP],
[AT_CHECK([grep -c '^$1$' YYParser.java], [], [m4_default([$2], [1]) [AT_CHECK([grep -c '^$1$' YYParser.java], [ignore], [m4_default([$2], [1])
]) ])])
])
# ------------------------------------- # # ------------------------------------- #

23
tests/javapush.at
View File

@@ -28,12 +28,13 @@
m4_define([PUSHPULLFLAG],[-Dapi.push-pull=both]) m4_define([PUSHPULLFLAG],[-Dapi.push-pull=both])
# Modify the grep tester from java.at # AT_CHECK_JAVA_GREP(FILE, [LINE], [COUNT=1])
# to ignore status so we can test for zero matching lines # -------------------------------------------
# Check that FILE contains exactly COUNT lines matching ^LINE$
# with grep. Unquoted so that COUNT can be a shell expression.
m4_define([AT_CHECK_JAVA_GREP], m4_define([AT_CHECK_JAVA_GREP],
[AT_CHECK([grep -c '^$2$' $1], [ignore], [m4_default([$3], [1]) [AT_CHECK_UNQUOTED([grep -c '^$2$' $1], [ignore], [m4_default([$3], [1])
]) ])])
])
################################################## ##################################################
@@ -172,24 +173,21 @@ AT_BISON_CHECK([[-Dapi.push-pull=pull -o Main.java input.y]])
AT_CHECK_JAVA_GREP([[Main.java]], AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public boolean parse ().*]], [[.*public boolean parse ().*]],
[1]) [1])
AT_CHECK_JAVA_GREP( AT_CHECK_JAVA_GREP([[Main.java]],
[[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]], [[.*public int push_parse (int yylextoken, Object yylexval).*]],
[0]) [0])
AT_BISON_CHECK([[-Dapi.push-pull=both -o Main.java input.y]]) AT_BISON_CHECK([[-Dapi.push-pull=both -o Main.java input.y]])
AT_CHECK_JAVA_GREP([[Main.java]], AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public boolean parse ().*]], [[.*public boolean parse ().*]],
[1]) [1])
AT_CHECK_JAVA_GREP( AT_CHECK_JAVA_GREP([[Main.java]],
[[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]], [[.*public int push_parse (int yylextoken, Object yylexval).*]],
[1]) [1])
AT_BISON_CHECK([[-Dapi.push-pull=push -o Main.java input.y]]) AT_BISON_CHECK([[-Dapi.push-pull=push -o Main.java input.y]])
AT_CHECK_JAVA_GREP([[Main.java]], AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public boolean parse ().*]], [[.*public boolean parse ().*]],
[0]) [0])
AT_CHECK_JAVA_GREP( AT_CHECK_JAVA_GREP([[Main.java]],
[[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]], [[.*public int push_parse (int yylextoken, Object yylexval).*]],
[1]) [1])
@@ -575,7 +573,8 @@ AT_JAVA_PARSER_CHECK([Calc input], 0, [ignore-nolog], [stderr-nolog])
# NOTE: because the target is "expout", this macro automatically # NOTE: because the target is "expout", this macro automatically
# compares the output of the sed command with the contents of # compares the output of the sed command with the contents of
# the file "expout" (defined above). # the file "expout" (defined above).
AT_CHECK([[sed -e '/^Stack now.*$/p' -e d ./stderr|tee jj]],[ignore],[expout],[ignore-nolog]) AT_CHECK([[sed -e '/^Stack now.*$/p' -e d ./stderr]],
[ignore], [expout], [ignore-nolog])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS
AT_CLEANUP AT_CLEANUP