From 4da97747ef8330c5da2451faed4ae4285862869f Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 8 Oct 2008 07:24:06 +0200
Subject: [PATCH] Do not write to testsuite log fd before initialization.

* lib/autotest/general.m4 (AS_MESSAGE_LOG_FD, AT_JOB_FIFO_FD):
Define fds only when initializing the log fd so early error
messages do not try to write to it.
* tests/autotest.at (Startup error messages): New test.
* NEWS: Document this 2.63 regression.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
 ChangeLog               | 9 +++++++++
 NEWS                    | 3 +++
 lib/autotest/general.m4 | 8 +++-----
 tests/autotest.at       | 8 ++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f072ae4f..97f07548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Do not write to testsuite log fd before initialization.
+	* lib/autotest/general.m4 (AS_MESSAGE_LOG_FD, AT_JOB_FIFO_FD):
+	Define fds only when initializing the log fd so early error
+	messages do not try to write to it.
+	* tests/autotest.at (Startup error messages): New test.
+	* NEWS: Document this 2.63 regression.
+
 2008-10-07  Eric Blake  <ebb9@byu.net>
 
 	Ensure _AS_CLEANUP is defined.
diff --git a/NEWS b/NEWS
index 01561274..b1de684b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ GNU Autoconf NEWS - User visible changes.
 
 ** Autotest testsuites accept an option --jobs[=N] for parallel testing.
 
+** Autotest testsuites do not attempt to write startup error messages
+   to the log file before that is opened (regression introduced in 2.63).
+
 ** The following m4sugar macros are new:
    m4_default_quoted
 
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index f1966cec..d19f9d9c 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -215,9 +215,6 @@ m4_define([AT_groups_all], [])
 m4_define([AT_help_all], [])
 m4_foreach([AT_name], [_AT_DEFINE_INIT_LIST], [m4_popdef(m4_defn([AT_name]))])
 m4_wrap([_AT_FINISH])
-dnl Define FDs.
-m4_define([AS_MESSAGE_LOG_FD], [5])
-m4_define([AT_JOB_FIFO_FD], [6])
 AS_INIT[]dnl
 m4_divert_push([DEFAULTS])dnl
 AT_COPYRIGHT(
@@ -892,8 +889,9 @@ PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-# 5 is the log file.  Not to be overwritten if `-d'.
-dnl FDs are defined earlier in this file.
+m4_define([AS_MESSAGE_LOG_FD], [5])
+m4_define([AT_JOB_FIFO_FD], [6])
+[#] AS_MESSAGE_LOG_FD is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
 else
diff --git a/tests/autotest.at b/tests/autotest.at
index 3547ee41..4361d075 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -216,6 +216,14 @@ AT_TESTED([autoconf])
 autom4te --version
 ]])])
 
+AT_CHECK_AT([Startup error messages],
+[[AT_INIT([[suite]])
+AT_SETUP([only test])
+AT_CHECK([:])
+AT_CLEANUP
+]], [], [], [], [],
+[AT_CHECK([sed -n '/exec AS_MESSAGE_LOG_FD/q; />&AS_MESSAGE_LOG_FD/p' < micro-suite])])
+
 ## ----------------------------------------------------- ##
 ## Newlines and command substitutions in test commands.  ##
 ## ----------------------------------------------------- ##