* lib/autotest/general.m4 (AT_INIT): Report a single config.log,

not all of them.  This fixes 1. the fact that when testing
Autoconf there are many many config.log, 2. the incorrect use of
top_srcdir to find config.log.
Don't mix the detailed output of failed test with the summary of
failures.  Rather, append detailed log afterwards.

diff --git a/ChangeLog b/ChangeLog
index a3a6857fe86b72db0ebf8822822779b55018e447..b8103c1babab2872a59ce06efa164fd74b4ce030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-23  Akim Demaille  <akim@epita.fr>
+
+       * lib/autotest/general.m4 (AT_INIT): Report a single config.log,
+       not all of them.  This fixes 1. the fact that when testing
+       Autoconf there are many many config.log, 2. the incorrect use of
+       top_srcdir to find config.log.
+       Don't mix the detailed output of failed test with the summary of
+       failures.  Rather, append detailed log afterwards.
+
 2003-06-23  Akim Demaille  <akim@epita.fr>
 
        * tests/local.at (AT_CHECK_CONFIGURE): Adjust to the verbose being

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 96d2724b5a50405eb1ae7bbeeb1e2da4af023d43..3c2c16879578428d43b4279c93783f9b1499ad4a 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -686,10 +686,9 @@ _ATEOF
          ;;
        *)
          # 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.
+         # log.  The failure message is written in the group log.  It
+         # is later included in the global log.
          echo "$at_log_msg" >> $at_group_log
-         cat $at_group_log >&AS_MESSAGE_LOG_FD
 
          # Upon failure, keep the group directory for autopsy, and
          # create the debugging script.
@@ -819,58 +818,65 @@ if test $at_unexpected_count = 0; then
 else
   echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&AS_MESSAGE_LOG_FD
-  if test $at_debug_p = false; then
+  {
     echo
-    echo 'You may investigate any problem if you feel able to do so, in which'
-    echo 'case the test suite provides a good starting point.'
-    echo
-    echo 'Failed tests have been logged in the file '$as_me'.log.'
+    AS_BOX([Summary of the failures.])
 
-    {
+    # Summary of failed and skipped tests.
+    if test $at_fail_count != 0; then
+      echo "Failed tests:"
+      $SHELL $[0] $at_fail_list --list
       echo
+    fi
+    if test $at_skip_count != 0; then
+      echo "Skipped tests:"
+      $SHELL $[0] $at_skip_list --list
       echo
-      AS_BOX([Summary of the failures.])
-
-      # Summary of failed and skipped tests.
-      if test $at_fail_count != 0; then
-        echo "Failed tests:"
-        $SHELL $[0] $at_fail_list --list
-        echo
-      fi
-      if test $at_skip_count != 0; then
-        echo "Skipped tests:"
-        $SHELL $[0] $at_skip_list --list
-        echo
-      fi
-      if test $at_xpass_count != 0; then
-        echo "Unexpected passes:"
-        $SHELL $[0] $at_xpass_list --list
-        echo
-      fi
-      if test -n "$at_top_srcdir"; then
-        AS_BOX([Configuration logs.])
+    fi
+    if test $at_xpass_count != 0; then
+      echo "Unexpected passes:"
+      $SHELL $[0] $at_xpass_list --list
+      echo
+    fi
+    if test $at_fail_count != 0; then
+      AS_BOX([Detailed failed tests.])
+      echo
+      for at_group in $at_fail_list
+      do
+        # Normalize the test group number.
+        at_group_normalized=`expr "00000$at_group" : ".*\($at_format\)"`
+        # Create a fresh directory for the next test group, and enter.
+        at_group_dir=$at_suite_dir/$at_group_normalized
+        at_group_log=$at_group_dir/$as_me.log
+        cat $at_group_log
         echo
-        for at_file in `find "$at_top_srcdir" -name config.log -print`
-        do
-         echo "$as_me: $at_file:"
-         sed 's/^/| /' $at_file
-         echo
-        done
-      fi
-    } >&AS_MESSAGE_LOG_FD
+      done
+      echo
+    fi
+    if test -n "$at_top_srcdir"; then
+      AS_BOX([$at_top_builddir/config.log])
+      sed 's/^/| /' $at_top_builddir/config.log
+      echo
+    fi
+  } >&AS_MESSAGE_LOG_FD
 
-    AS_BOX([$as_me.log was created.])
+  AS_BOX([$as_me.log was created.])
 
-    echo
-    echo "Please send \`$as_me.log' and all information you think might help:"
-    echo
-    echo "   To: <AT_PACKAGE_BUGREPORT>"
-    echo "   Subject: @<:@AT_PACKAGE_STRING@:>@ $as_me:dnl
+  echo
+  echo "Please send \`$as_me.log' and all information you think might help:"
+  echo
+  echo "   To: <AT_PACKAGE_BUGREPORT>"
+  echo "   Subject: @<:@AT_PACKAGE_STRING@:>@ $as_me:dnl
 $at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}dnl
 $at_xpass_list${at_xpass_list:+ passed unexpectedly}"
+  echo
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.'
     echo
-    exit 1
   fi
+    exit 1
 fi
 
 exit 0