[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1019-ga3e7e1b

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc

The branch, test-protocols has been updated
       via  a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc (commit)
       via  7afca964324add2466d851aa07c3c650f624ed78 (commit)
      from  9e5967708814027981d910e6fed4f7789eba23f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 12 23:49:57 2011 +0200

    testsuite: fix an unportable use of sed
    
    * tests/tap-todo-skip-whitespace.test: Alternation with "\|" in
    sed regular expressions is not portable to (at least) FreeBSD
    sed; do not use it.

commit 7afca964324add2466d851aa07c3c650f624ed78
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 12 23:33:56 2011 +0200

    testsuite: avoid spurious failure if rst2html program is missing
    
    * tests/test-driver-custom-no-html.test: Account for the
    possibility of a lacking `rst2html' program in our final
    grepping of make output.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                             |   14 ++++++++++++++
 tests/tap-todo-skip-whitespace.test   |    2 +-
 tests/test-driver-custom-no-html.test |    4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b4ab34..bf629e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-08-12  Stefano Lattarini  <address@hidden>
 
+       testsuite: fix an unportable use of sed
+       * tests/tap-todo-skip-whitespace.test: Alternation with "\|" in
+       sed regular expressions is not portable to (at least) FreeBSD
+       sed; do not use it.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure if rst2html program is missing
+       * tests/test-driver-custom-no-html.test: Account for the
+       possibility of a lacking `rst2html' program in our final
+       grepping of make output.
+
+2011-08-12  Stefano Lattarini  <address@hidden>
+
        tap: improve diagnosing and reporting of plan mismatches
        Problem exposed by a failure in the test 'tap-plan-errors.test'.
        * lib/tap-driver (NO_PLAN, EARLY_PLAN, LATE_PLAN): New constants.
diff --git a/tests/tap-todo-skip-whitespace.test 
b/tests/tap-todo-skip-whitespace.test
index 695e98c..fe32c97 100755
--- a/tests/tap-todo-skip-whitespace.test
+++ b/tests/tap-todo-skip-whitespace.test
@@ -76,7 +76,7 @@ my_make_check ()
   # Don't be too strict w.r.t. possible normalization of "TODO: foo" into
   # "TODO : foo" (as is done by, e.g., the 'TAP::Parser' perl module).
   LC_ALL=C grep '^[A-Z][A-Z]*:' stdout \
-    | sed -e 's/# \(TODO\|SKIP\) *:/# \1:/' > got
+    | sed -e 's/# TODO *:/# TODO:/' -e 's/# SKIP *:/# SKIP:/' > got
   cat exp
   cat got
   diff exp got
diff --git a/tests/test-driver-custom-no-html.test 
b/tests/test-driver-custom-no-html.test
index 2c86026..37b93bc 100755
--- a/tests/test-driver-custom-no-html.test
+++ b/tests/test-driver-custom-no-html.test
@@ -62,6 +62,8 @@ $FGREP 'dummy title' test-suite.log
 # Sanity check: trying to produce HTML output should fail.
 $MAKE check-html >output 2>&1 && { cat output; Exit 1; }
 cat output
-$FGREP SEVERE output
+# The second grep is to avoid spurious failures on systems without
+# a working `rst2html' program.
+$FGREP SEVERE output || $FGREP 'cannot find rst2html' output
 
 :


hooks/post-receive
-- 
GNU Automake