[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1049-g8a4e2af

[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=8a4e2afa54cbc1f148d899bd5cea6a2ada39d2e9

The branch, test-protocols has been updated
       via  8a4e2afa54cbc1f148d899bd5cea6a2ada39d2e9 (commit)
       via  484ec4ec8d7e07e8a63c920b25f3267754542c8e (commit)
       via  6c20cf0710ef99d0c9b2c1622b18867311cbe78b (commit)
      from  c9ca5f61d87cb0578d32981b2ee32118d934ce21 (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 8a4e2afa54cbc1f148d899bd5cea6a2ada39d2e9
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 22 10:40:12 2011 +0200

    testsuite: avoid spurious failure if rst2html program is missing
    
    * tests/tap-html.test ($required): Require `rst2html'.

commit 484ec4ec8d7e07e8a63c920b25f3267754542c8e
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 22 10:02:11 2011 +0200

    tap/awk: support Solaris /usr/xpg4/bin/awk
    
    * lib/tap-driver.sh: Use `\t', not `\\t', to represent tabulation
    character in regexps, even when inside double-quoted strings; that
    seems to be more portable to Solaris 10 XPG4 awk.

commit 6c20cf0710ef99d0c9b2c1622b18867311cbe78b
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 22 08:43:22 2011 +0200

    tap/awk: support Solaris /usr/bin/nawk
    
    * lib/tap-driver.sh (close_or_die): Remove, the use of the `close'
    builtin in there was confusing /usr/bin/nawk from Solaris 10 into
    a syntax error.
    (write_test_results): Simply use `close' on the `*.trs' file, that
    should be enough.

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

Summary of changes:
 ChangeLog           |   21 +++++++++++++++++++++
 lib/tap-driver.sh   |   34 ++++++++++++++--------------------
 tests/tap-html.test |    1 +
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 738e10f..1dec4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       testsuite: avoid spurious failure if rst2html program is missing
+       * tests/tap-html.test ($required): Require `rst2html'.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: support Solaris /usr/xpg4/bin/awk
+       * lib/tap-driver.sh: Use `\t', not `\\t', to represent tabulation
+       character in regexps, even when inside double-quoted strings; that
+       seems to be more portable to Solaris 10 XPG4 awk.
+
+2011-08-22  Stefano Lattarini  <address@hidden>
+
+       tap/awk: support Solaris /usr/bin/nawk
+       * lib/tap-driver.sh (close_or_die): Remove, the use of the `close'
+       builtin in there was confusing /usr/bin/nawk from Solaris 10 into
+       a syntax error.
+       (write_test_results): Simply use `close' on the `*.trs' file, that
+       should be enough.
+
 2011-08-21  Stefano Lattarini  <address@hidden>
 
        tap/awk: correctly extract message from SKIP plans
diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh
index dd2b929..ac87b9e 100755
--- a/lib/tap-driver.sh
+++ b/lib/tap-driver.sh
@@ -155,12 +155,6 @@ function abort(where)
   fatal("internal error " where)
 }
 
-function close_or_die(fpath, fname)
-{
-  if (close(fpath) != 0)
-    fatal(sprintf("could not close %s \"%s\"", fname, fpath))
-}
-
 # Convert a boolean to a "yes"/"no" string.
 function yn(bool)
 {
@@ -341,8 +335,8 @@ function extract_tap_comment(line)
       # FIXME: verify there is not an off-by-one bug here.
       line = substr(line, length(diag_string) + 1)
       # And strip any leading and trailing whitespace left.
-      sub("^[ \\t]*", "", line)
-      sub("[ \\t]*$", "", line)
+      sub("^[ \t]*", "", line)
+      sub("[ \t]*$", "", line)
       # Return what is left (if any).
       return line;
     }
@@ -355,7 +349,7 @@ function setup_result_obj(line)
 {
   # Get the result, and remove it from the line.
   result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
-  sub("^(not )?ok[ \\t]*", "", line)
+  sub("^(not )?ok[ \t]*", "", line)
 
   # If the result has an explicit number, get it and strip it; otherwise,
   # automatically assing the next progresive number to it.
@@ -381,8 +375,8 @@ function setup_result_obj(line)
     result_obj["is_unplanned"] = 0
 
   # Strip trailing and leading whitespace.
-  sub("^[ \\t]*", "", line)
-  sub("[ \\t]*$", "", line)
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
 
   # This will have to be corrected if we have a "TODO"/"SKIP" directive.
   result_obj["description"] = line
@@ -394,7 +388,7 @@ function setup_result_obj(line)
     return # No possible directive, nothing more to do.
 
   # Directives are case-insensitive.
-  rx = "[ \\t]*#[ \\t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \\t]*"
+  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
 
   # See whether we have the directive, and if yes, where.
   pos = match(line, rx "$")
@@ -412,13 +406,13 @@ function setup_result_obj(line)
   # with already.
   line = substr(line, pos)
   # Strip the directive, and save its value (normalized to upper case).
-  sub("^[ \\t]*#[ \\t]*", "", line)
+  sub("^[ \t]*#[ \t]*", "", line)
   result_obj["directive"] = toupper(substr(line, 1, 4))
   line = substr(line, 5)
   # Now get the explanation for the directive (if any), with leading
   # and trailing whitespace removed.
-  sub("^[ \\t]*", "", line)
-  sub("[ \\t]*$", "", line)
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
   result_obj["explanation"] = line
 }
 
@@ -429,7 +423,7 @@ function write_test_results()
   print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
   for (i = 0; i < test_results_index; i += 1)
     print ":test-result: " test_results_list[i] > trs_file
-  close_or_die(trs_file, "trs file");
+  close(trs_file);
 }
 
 ## ------- ##
@@ -502,8 +496,8 @@ BEGIN {
   # leading and trailing whitespace.  This is a little more tricky in
   # thruth, since we want to also strip a potential leading "SKIP"
   # string from the message.
-  sub("^[^#]*#[ \\t]*(SKIP[: \\t][ \\t]*)?", "")
-  sub("[ \\t]*$", "");
+  sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
+  sub("[ \t]*$", "");
   handle_tap_plan(0, $0)
   next
 
@@ -515,8 +509,8 @@ BEGIN {
   bailed_out = 1
   # Get the bailout message (if any), with leading and trailing
   # whitespace stripped.  The message remains stored in `$0`.
-  sub("^Bail out![ \\t]*", "");
-  sub("[ \\t]*$", "");
+  sub("^Bail out![ \t]*", "");
+  sub("[ \t]*$", "");
   # Format the error message for the
   bailout_message = "Bail out!"
   if (length($0))
diff --git a/tests/tap-html.test b/tests/tap-html.test
index b5a1beb..07c0294 100755
--- a/tests/tap-html.test
+++ b/tests/tap-html.test
@@ -19,6 +19,7 @@
 #  - reStructuredText -> HTML conversion
 
 parallel_tests=yes
+required=rst2html
 . ./defs || Exit 1
 
 cat > Makefile.am << 'END'


hooks/post-receive
-- 
GNU Automake