[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-324-g92d3059

[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=92d305960d83749239dae4579bfb46fb08ae6c23

The branch, ng/master has been updated
       via  92d305960d83749239dae4579bfb46fb08ae6c23 (commit)
      from  8fc38b76b4d35e135599cd1e2138daa0cf08bb89 (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 92d305960d83749239dae4579bfb46fb08ae6c23
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 25 17:52:35 2012 +0200

    [ng] check: fix incompatibility with Solaris nawk
    
    On Solaris 10, the parallel testsuite harness could fail with errors
    like this when /usr/bin/nawk was the selected awk program.
    
      nawk: next is illegal inside a function at source line 1 in \
      function input_error; context is:
          function input_error(file) { ... close_current(); next; >>> } <<<
    
    * lib/am/parallel-tests.am (am__create_global_log): In the awk script
    defined by this function, avoid use of the 'next' directive inside a
    function.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 lib/am/parallel-tests.am |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index 0c3e9ff..819b4e2 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -189,7 +189,6 @@ function input_error(file) \
 { \
   error("awk" ": cannot read \"" file "\""); \
   close_current(); \
-  next; \
 } \
 function rst_section(header) \
 { \
@@ -209,7 +208,10 @@ BEGIN { exit_status = 0; } \
   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
     { \
       if (rc < 0) \
-        input_error($$0 ".trs"); \
+        { \
+          input_error($$0 ".trs"); \
+          next; \
+        } \
       if (line ~ /$(am__global_test_result_rx)/) \
         { \
           sub("$(am__global_test_result_rx)", "", line); \
@@ -225,7 +227,10 @@ BEGIN { exit_status = 0; } \
       while ((rc = (getline line < ($$0 ".log"))) != 0) \
       { \
         if (rc < 0) \
-          input_error($$0 ".log"); \
+          { \
+            input_error($$0 ".log"); \
+            next; \
+          } \
         print line; \
       }; \
       printf "\n"; \


hooks/post-receive
-- 
GNU Automake