* lib/autotest/general.m4: Use at_times_file only if used.

From Nicolas Joly.

diff --git a/ChangeLog b/ChangeLog
index 877cf4e4905600d356364395ace4dff58dadb693..fc14ea7adb2aa9434c6493fc8aaef76db70e6483 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-20  Akim Demaille  <akim@epita.fr>
+
+       * lib/autotest/general.m4: Use at_times_file only if used.
+       From Nicolas Joly.
+
 2003-06-20  Akim Demaille  <akim@epita.fr>
 
        * config/config.guess, config/config.sub, config/elisp-comp,

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index b919e14a266a53b0601dc1acdc94309a7e67267c..96d2724b5a50405eb1ae7bbeeb1e2da4af023d43 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                          -*- Autoconf -*-
 # M4 macros used in building test suites.
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -671,11 +671,13 @@ _ATEOF
       at_log_msg="$at_group. $at_setup_line: $at_msg"
       case $at_status in
        0|77)
-         # $at_times_file is only available if the group succeeded or was skipped.
-         # We're not including the group log, so the success message is written
-         # in the global log separately.  But we also write to the group log in
-         # case they're using -d.
-         at_log_msg="$at_log_msg       (`sed 1d $at_times_file`)"
+         # $at_times_file is only available if the group succeeded or
+         # was skipped.  We're not including the group log, so the
+         # success message is written in the global log separately.
+         # But we also write to the group log in case they're using
+         # -d.
+         $at_times_skip ||
+           at_log_msg="$at_log_msg     (`sed 1d $at_times_file`)"
          echo "$at_log_msg" >> $at_group_log
          echo "$at_log_msg" >&AS_MESSAGE_LOG_FD
 
@@ -683,9 +685,9 @@ _ATEOF
          $at_debug_p || rm -rf $at_group_dir
          ;;
        *)
-         # Upon failure, include the log into the testsuite's global log.
-         # The failure message is written in the group log and then included
-         # in the global log.
+         # Upon failure, include the log into the testsuite's global
+         # log.  The failure message is written in the group log and
+         # then included in the global log.
          echo "$at_log_msg" >> $at_group_log
          cat $at_group_log >&AS_MESSAGE_LOG_FD