[PATCH 0/3] {maint} tests: fix/clean syncline tests

[Akim Demaille]

Changes prompted by Sum's private message.

Akim Demaille (3):
  tests: fix perl invocation
  tests: synclines: style changes.
  tests: synch line -> syncline, for consistency

 tests/synclines.at | 62 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

--
1.7.11.3

[Akim Demaille]

Reported by Summum Bonum.

* tests/synclines.at: Fix Perl invocation: its -f is not like sed's.
---
 tests/synclines.at | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/synclines.at b/tests/synclines.at
index 7e7122f..1bda1c4 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -64,7 +64,7 @@ m4_define([AT_SYNCLINES_COMPILE],
 #   distcc[35882] (dcc_connect_by_name) ERROR: failed to look up host "chrisimac": Unknown host
 #   distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead
 
-AT_CHECK([[perl -p -0777 -f - stderr <<\EOF
+AT_CHECK([[perl -p -0777 - stderr <<\EOF
  s/^distcc\[\d+\] .*\n//gm;
  s/^([^:]*:\d+)[.:][^:]*:(.*)$/$][1:$][2/gm;
  s/^([^:]*:\d+:)[^#]*( #error)/$][1$][2/gm;
--
1.7.11.3

[Akim Demaille]

* tests/synclines.at (AT_TEST_SYNCLINE): Rename as...
(AT_TEST): this.
Use pushdef/popdef.
Formatting changes.
Use '+' instead of '*' where appropriate.
---
 tests/synclines.at | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/synclines.at b/tests/synclines.at
index 1bda1c4..61f274a 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -65,21 +65,21 @@ m4_define([AT_SYNCLINES_COMPILE],
 #   distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead
 
 AT_CHECK([[perl -p -0777 - stderr <<\EOF
- s/^distcc\[\d+\] .*\n//gm;
- s/^([^:]*:\d+)[.:][^:]*:(.*)$/$][1:$][2/gm;
- s/^([^:]*:\d+:)[^#]*( #error)/$][1$][2/gm;
- s/^[^:]*: In function '[^']*':\n//gm;
- s/^\ +#error.*\n\ *\^\n//gm;
+  s/^distcc\[\d+\] .*\n//gm;
+  s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm;
+  s/^([^:]+:\d+):[^#]*( #error)/$][1:$][2/gm;
+  s/^[^:]*: In function '[^']+':\n//gm;
+  s/^\ +#error.*\n\ *\^\n//gm;
 EOF
 ]],
- 0, [stdout])
+  0, [stdout])
 ])
 
-# AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
-# -----------------------------------------
+# AT_TEST(TITLE, INPUT, ERROR-MSG)
+# --------------------------------
 # Check that compiling the parser produced from INPUT cause GCC
 # to issue ERROR-MSG.
-m4_define([AT_TEST_SYNCLINE],
+m4_pushdef([AT_TEST],
 [AT_SETUP([$1])
 AT_BISON_OPTION_PUSHDEFS
 # It seems impossible to find a generic scheme to check the location
@@ -121,7 +121,7 @@ AT_CLEANUP
 ## --------------------- ##
 
 
-AT_TEST_SYNCLINE([Prologue synch line],
+AT_TEST([Prologue synch line],
 [[%{
 #error "2"
 ]AT_YYERROR_DECLARE_EXTERN[
@@ -139,7 +139,7 @@ exp: '0';
 ## %union synch line.  ##
 ## ------------------- ##
 
-AT_TEST_SYNCLINE([%union synch line],
+AT_TEST([%union synch line],
 [[%union {
 #error "2"
   char dummy;
@@ -160,7 +160,7 @@ exp: '0';
 ## Postprologue synch line.  ##
 ## ------------------------- ##
 
-AT_TEST_SYNCLINE([Postprologue synch line],
+AT_TEST([Postprologue synch line],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
@@ -184,7 +184,7 @@ exp: '0';
 ## Action synch line.  ##
 ## ------------------- ##
 
-AT_TEST_SYNCLINE([Action synch line],
+AT_TEST([Action synch line],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
@@ -203,7 +203,7 @@ exp:
 ## Epilogue synch line.  ##
 ## --------------------- ##
 
-AT_TEST_SYNCLINE([Epilogue synch line],
+AT_TEST([Epilogue synch line],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
@@ -215,3 +215,5 @@ exp: '0';
 ]],
 [input.y:8: #error "8"
 ])
+
+m4_popdef([AT_TEST])
--
1.7.11.3

[Akim Demaille]

* tests/synclines.at: Do it, as "syncline" is used consistently
everywhere else in Bison.
---
 tests/synclines.at | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/synclines.at b/tests/synclines.at
index 61f274a..e2b7005 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -116,12 +116,12 @@ AT_CLEANUP
 ])
 
 
-## --------------------- ##
-## Prologue synch line.  ##
-## --------------------- ##
+## ------------------- ##
+## Prologue syncline.  ##
+## ------------------- ##
 
 
-AT_TEST([Prologue synch line],
+AT_TEST([Prologue syncline],
 [[%{
 #error "2"
 ]AT_YYERROR_DECLARE_EXTERN[
@@ -135,11 +135,11 @@ exp: '0';
 ])
 
 
-## ------------------- ##
-## %union synch line.  ##
-## ------------------- ##
+## ----------------- ##
+## %union syncline.  ##
+## ----------------- ##
 
-AT_TEST([%union synch line],
+AT_TEST([%union syncline],
 [[%union {
 #error "2"
   char dummy;
@@ -156,11 +156,11 @@ exp: '0';
 ])
 
 
-## ------------------------- ##
-## Postprologue synch line.  ##
-## ------------------------- ##
+## ----------------------- ##
+## Postprologue syncline.  ##
+## ----------------------- ##
 
-AT_TEST([Postprologue synch line],
+AT_TEST([Postprologue syncline],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
@@ -180,11 +180,11 @@ exp: '0';
 ])
 
 
-## ------------------- ##
-## Action synch line.  ##
-## ------------------- ##
+## ----------------- ##
+## Action syncline.  ##
+## ----------------- ##
 
-AT_TEST([Action synch line],
+AT_TEST([Action syncline],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
@@ -199,11 +199,11 @@ exp:
 ])
 
 
-## --------------------- ##
-## Epilogue synch line.  ##
-## --------------------- ##
+## ------------------- ##
+## Epilogue syncline.  ##
+## ------------------- ##
 
-AT_TEST([Epilogue synch line],
+AT_TEST([Epilogue syncline],
 [[%{
 ]AT_YYERROR_DECLARE_EXTERN[
 ]AT_YYLEX_DECLARE_EXTERN[
--
1.7.11.3