[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] style: minor changes in the Java tests
From: |
Akim Demaille |
Subject: |
[PATCH 05/10] style: minor changes in the Java tests |
Date: |
Mon, 24 Jun 2013 10:50:02 +0200 |
* 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.
---
tests/java.at | 5 ++---
tests/javapush.at | 23 +++++++++++------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/tests/java.at b/tests/java.at
index 968b47f..2b20698 100644
--- a/tests/java.at
+++ b/tests/java.at
@@ -444,9 +444,8 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER],
# Check that YYParser.java contains exactly COUNT lines matching ^LINE$
# with 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])
+])])
# ------------------------------------- #
diff --git a/tests/javapush.at b/tests/javapush.at
index 65027c3..f50b666 100644
--- a/tests/javapush.at
+++ b/tests/javapush.at
@@ -28,12 +28,13 @@
m4_define([PUSHPULLFLAG],[-Dapi.push-pull=both])
-# Modify the grep tester from java.at
-# to ignore status so we can test for zero matching lines
+# AT_CHECK_JAVA_GREP(FILE, [LINE], [COUNT=1])
+# -------------------------------------------
+# 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],
- [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]],
[[.*public boolean parse ().*]],
[1])
-AT_CHECK_JAVA_GREP(
- [[Main.java]],
+AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]],
[0])
AT_BISON_CHECK([[-Dapi.push-pull=both -o Main.java input.y]])
AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public boolean parse ().*]],
[1])
-AT_CHECK_JAVA_GREP(
- [[Main.java]],
+AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]],
[1])
AT_BISON_CHECK([[-Dapi.push-pull=push -o Main.java input.y]])
AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public boolean parse ().*]],
[0])
-AT_CHECK_JAVA_GREP(
- [[Main.java]],
+AT_CHECK_JAVA_GREP([[Main.java]],
[[.*public int push_parse (int yylextoken, Object yylexval).*]],
[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
# compares the output of the sed command with the contents of
# 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_CLEANUP
--
1.8.2.3
- [PATCH 00/10] Push parser support for Java, Akim Demaille, 2013/06/24
- [PATCH 04/10] java: push: do not reset the error counter, Akim Demaille, 2013/06/24
- [PATCH 01/10] build: ship all the files, even if the C++ compiler is broken, Akim Demaille, 2013/06/24
- [PATCH 03/10] build: add Valgrind suppression file for GNU/Linux, Akim Demaille, 2013/06/24
- [PATCH 10/10] maint: post-release administrivia, Akim Demaille, 2013/06/24
- [PATCH 05/10] style: minor changes in the Java tests,
Akim Demaille <=
- [PATCH 07/10] java: rename YYMORE as YYPUSH_MORE for consistency with C, Akim Demaille, 2013/06/24
- [PATCH 06/10] tests: fix Java push failure when running with BISON_USE_PUSH_FOR_PULL, Akim Demaille, 2013/06/24
- [PATCH 08/10] NEWS: prepare for 2.7.91, Akim Demaille, 2013/06/24
- [PATCH 09/10] version 2.7.91, Akim Demaille, 2013/06/24
- [PATCH 02/10] java: add push-parser support, Akim Demaille, 2013/06/24