Fix portability issue in the test suite.

	* tests/local.at (AT_MATCHES_CHECK): New.
	Based on Perl instead of Sed.  Sed has too many portability
	pitfalls, not ever Sed is GNU Sed.
	* tests/actions.at (Fix user actions without a trailing semicolon):
	Use it.
(cherry picked from commit 6617622c9aaa6ec3a9de5b0867421e2849b68b2f)

diff --git a/ChangeLog b/ChangeLog
index 5104afbf14f4c3df785beb6a0d1aceb5f791eb7b..a7603bdea0b53f581a040a4e5778be7ade64ebe1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-08  Akim Demaille  <demaille@gostai.com>
+
+       Fix portability issue in the test suite.
+       * tests/local.at (AT_MATCHES_CHECK): New.
+       Based on Perl instead of Sed.  Sed has too many portability
+       pitfalls, not ever Sed is GNU Sed.
+       * tests/actions.at (Fix user actions without a trailing semicolon):
+       Use it.
+

 2008-12-07  Di-an Jan  <dianj@freeshell.org>
 
        Implement the FIXME that ends an user action with a semicolon
 2008-12-07  Di-an Jan  <dianj@freeshell.org>
 
        Implement the FIXME that ends an user action with a semicolon

diff --git a/tests/actions.at b/tests/actions.at
index 32bfc34e4c4a2d59cb4957a09e06fb6dc4cb1c61..841ae3925898662bc29299a70500ae96529d6af5 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -1400,20 +1400,11 @@ input.y:35.1: warning: future versions of Bison will not add the `;'
 input.y:36.1: warning: a `;' might be needed at the end of action code
 input.y:36.1: warning: future versions of Bison will not add the `;'
 ]])
 input.y:36.1: warning: a `;' might be needed at the end of action code
 input.y:36.1: warning: future versions of Bison will not add the `;'
 ]])

-AT_CHECK([[grep -c '/\* TEST:N:2 \*/ }$' input.c]], [0], [[3
-]])
-AT_CHECK([[grep -c '/\* TEST:Y:2 \*/ ;}$' input.c]], [0], [[6
-]])
-AT_CHECK([[sed -n '/TEST:N:1/{N
-s/\n/<NL>/gp}' input.c | grep -c '// TEST:N:1 [;{}]*<NL>}$']], [0], [[6
-]])
-AT_CHECK([[sed -n '/TEST:Y:1/{N
-s/\n/<NL>/gp}' input.c | grep -c '// TEST:Y:1 [;{}]*<NL>;}$']], [0], [[12
-]])
-AT_CHECK([[sed -n '/^#define TEST_MACRO_N/{N
-N
-s/\n/<NL>/gp}' input.c | grep -F -xc '#define TEST_MACRO_N \<NL>[]"broken\" $ @ $$ @$ [];\<NL>string;"}']],
-       [0], [[2
-]])
+
+AT_MATCHES_CHECK([input.c], [[/\* TEST:N:2 \*/ \}$]],       [[3]])
+AT_MATCHES_CHECK([input.c], [[/\* TEST:Y:2 \*/ ;\}$]],      [[6]])
+AT_MATCHES_CHECK([input.c], [[// TEST:N:1 [;{}]*\n\}$]],    [[6]])
+AT_MATCHES_CHECK([input.c], [[// TEST:Y:1 [;{}]*\n;\}$]],  [[12]])
+AT_MATCHES_CHECK([input.c], [[#define TEST_MACRO_N \\\n\[\]"broken\\" \$ \@ \$\$ \@\$ \[\];\\\nstring;"\}]], [[2]])

 
 AT_CLEANUP
 
 AT_CLEANUP

diff --git a/tests/local.at b/tests/local.at
index 01adaf5d2c571d3b66c80bc8a76519aa2daf5b19..163de2ef13013d9c3f07ffca3596598fc0333837 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -21,6 +21,22 @@
 m4_version_prereq([2.58])
 
 
 m4_version_prereq([2.58])
 
 

+## ------------- ##
+## Basic tests.  ##
+## ------------- ##
+
+# AT_MATCHES_CHECK(FILE, PERL-REGEXP, COUNT)
+# ------------------------------------------
+# Expect COUNT matches of the PERL-REGEXP in FILE.  The file is
+# taken in "slurp" mode, i.e., one can match end-of-lines.
+m4_define([AT_MATCHES_CHECK],
+[AT_CHECK([perl -0777 -ne '
+my $count = 0;
+s{$2}{ ++$count; "" }gem;
+printf "$count\n";' $1], [0], [$3
+])])
+
+

 ## ------------------------------- ##
 ## Macros decoding Bison options.  ##
 ## ------------------------------- ##
 ## ------------------------------- ##
 ## Macros decoding Bison options.  ##
 ## ------------------------------- ##