[SCM] GNU Autoconf source repository branch, master, updated. v2.63b-69-g9a15f2f

[Eric Blake]

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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=9a15f2f077736b7d52ce01b6102ee9a495f02452

The branch, master has been updated
       via  9a15f2f077736b7d52ce01b6102ee9a495f02452 (commit)
       via  26f07a33512e001057c161e760b7d5a4a0f7f0bb (commit)
      from  1ba58ec955f5e2f265f68e9fd615e7e3e4fb74eb (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 9a15f2f077736b7d52ce01b6102ee9a495f02452
Author: Eric Blake <address@hidden>
Date:   Tue Jul 7 23:01:23 2009 -0600

    Skip parallel tests when zsh 'set -m' fails.
    
    * tests/autotest.at (AT_SKIP_PARALLEL_TESTS): Skip test if set -m
    is not supported.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 26f07a33512e001057c161e760b7d5a4a0f7f0bb
Author: Eric Blake <address@hidden>
Date:   Tue Jul 7 06:58:18 2009 -0600

    Make parallel testsuite more portable.
    
    * lib/autotest/general.m4 (AT_INIT) <AT_JOB_FIFO_FD>: Avoid <>;
    instead open write descriptor in each group and read descriptor in
    main driver.
    * tests/autotest.at (AT_SKIP_PARALLEL_TESTS): Relax condition.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog               |   13 +++++++++++++
 lib/autotest/general.m4 |   12 +++++++-----
 tests/autotest.at       |    4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68c4490..fed334e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-07-07  Eric Blake  <address@hidden>
+
+       Skip parallel tests when zsh 'set -m' fails.
+       * tests/autotest.at (AT_SKIP_PARALLEL_TESTS): Skip test if set -m
+       is not supported.
+       Reported by Ralf Wildenhues.
+
+       Make parallel testsuite more portable.
+       * lib/autotest/general.m4 (AT_INIT) <AT_JOB_FIFO_FD>: Avoid <>;
+       instead open write descriptor in each group and read descriptor in
+       main driver.
+       * tests/autotest.at (AT_SKIP_PARALLEL_TESTS): Relax condition.
+
 2009-07-03  Eric Blake  <address@hidden>
 
        Avoid syntax error in ash.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 50c2ff7..a032462 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1296,9 +1296,7 @@ at_first=:
 if test $at_jobs -ne 1 &&
      rm -f "$at_job_fifo" &&
      test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && eval 'exec AT_JOB_FIFO_FD<> "$at_job_fifo"' \
-       && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null &&
-     eval 'exec AT_JOB_FIFO_FD<> "$at_job_fifo"'
+     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
 then
   # FIFO job dispatcher.
 
@@ -1344,6 +1342,7 @@ dnl avoid all the status output by the shell.
     (
       # Start one test group.
       $at_job_control_off
+      exec AT_JOB_FIFO_FD>"$at_job_fifo"
 dnl When a child receives PIPE, be sure to write back the token,
 dnl so the master does not hang waiting for it.
 dnl errexit and xtrace should not be set in this shell instance,
@@ -1362,7 +1361,7 @@ dnl           kill -13 $$
       at_fn_group_prepare
       if cd "$at_group_dir" &&
         at_fn_test $at_group &&
-        . "$at_test_source" # AT_JOB_FIFO_FD<&-
+        . "$at_test_source" # AT_JOB_FIFO_FD>&-
       then :; else
        AS_WARN([unable to parse test group: $at_group])
        at_failed=:
@@ -1371,13 +1370,16 @@ dnl         kill -13 $$
       echo token >&AT_JOB_FIFO_FD
     ) &
     $at_job_control_off
+    if $at_first; then
+      at_first=false
+      exec AT_JOB_FIFO_FD<"$at_job_fifo"
+    fi
     shift # Consume one token.
     if test address@hidden:@] -gt 0; then :; else
       read at_token <&AT_JOB_FIFO_FD || break
       set x $[*]
     fi
     test -f "$at_stop_file" && break
-    at_first=false
   done
   # Read back the remaining ($at_jobs - 1) tokens.
   set X $at_joblist
diff --git a/tests/autotest.at b/tests/autotest.at
index e83b329..9bdb728 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -992,9 +992,9 @@ m4_define([AT_SKIP_PARALLEL_TESTS],
 # limited conditions; help is appreciated in widening this test base.
 AT_CHECK([${CONFIG_SHELL-$SHELL} -c 'test -n "${BASH_VERSION+set}]]dnl
 [[${ZSH_VERSION+set}${TEST_PARALLEL_AUTOTEST+set}"' || exit 77])
-# The parallel scheduler requires mkfifo and bidirectional redirection to work.
+# The parallel scheduler requires mkfifo and job control to work.
 AT_CHECK([mkfifo fifo || exit 77])
-AT_CHECK([${CONFIG_SHELL-$SHELL} -c 'eval "exec 5<>fifo"' || exit 77])
+AT_CHECK([${CONFIG_SHELL-$SHELL} -c '(set -m && set +m) || exit 77'])
 ])
 
 


hooks/post-receive
-- 
GNU Autoconf source repository