autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [GNU Autoconf 2.57] testsuite: 39 40 failed


From: Akim Demaille
Subject: Re: [GNU Autoconf 2.57] testsuite: 39 40 failed
Date: Fri, 26 Sep 2003 10:22:03 +0200
User-agent: Gnus/5.1002 (Gnus v5.10.2) Emacs/21.3 (gnu/linux)

Thanks!  I'm installing the following patch; could you confirm it
fixes the problem?  TIA.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        The test suite are sometimes assigning timings incorrectly.
        Reported by Henk Krus.
        Diagnosed by Nicolas Joly.

        * lib/autotest/general.m4 (AT_CLEANUP): Rename AT_help as
        AT_help_all.
        Instead of making AT_help a sequence of assignments to grow
        $at_help_all, just make AT_help_all be the growing contents of
        $at_help_all, and make a single assignment in...
        (AT_INIT): here.
        (at_times_skip): Flip the meaning and rename as...
        (at_times_p): this.
        (AT_INIT): When summarizing the test that ran, remove
        $at_times_file after use, and check it is present before trying to
        use it.

Index: THANKS
===================================================================
RCS file: /cvsroot/autoconf/autoconf/THANKS,v
retrieving revision 1.118
diff -u -u -u -r1.118 THANKS
--- THANKS 11 Sep 2003 07:06:56 -0000 1.118
+++ THANKS 26 Sep 2003 08:16:23 -0000
@@ -76,6 +76,7 @@
 Guillermo Gomez             address@hidden
 Hans Olsson                 address@hidden
 Harlan Stenn                address@hidden
+Henk Krus                   address@hidden
 H.J. Lu                     address@hidden
 H. Merijn Brand             address@hidden
 Ian Lance Taylor            address@hidden
Index: lib/autotest/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -u -u -r1.152 -r1.153
--- lib/autotest/general.m4 19 Aug 2003 18:21:40 -0000 1.152
+++ lib/autotest/general.m4 26 Sep 2003 08:12:39 -0000 1.153
@@ -171,8 +171,8 @@
 
 # Not all shells have the 'times' builtin; the subshell is needed to make
 # sure we discard the 'times: not found' message from the shell.
-at_times_skip=:
-(times) >/dev/null 2>&1 && at_times_skip=false
+at_times_p=false
+(times) >/dev/null 2>&1 && at_times_p=:
 
 # CLI Arguments to pass to the debugging scripts.
 at_debug_args=
@@ -221,8 +221,7 @@
 # numerical order.
 at_format='m4_bpatsubst(m4_defn([AT_ordinal]), [.], [.])'
 # Description of all the test groups.
-at_help_all=
-AT_help])])dnl
+at_help_all='AT_help_all'])])dnl
 m4_divert_push([PARSE_ARGS])dnl
 
 at_keywords=
@@ -681,13 +680,14 @@
       at_log_msg="$at_group. $at_desc ($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_times_skip ||
+         # $at_times_file is only available if the group succeeded.
+         # 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.
+         if test -f $at_times_file; then
            at_log_msg="$at_log_msg     (`sed 1d $at_times_file`)"
+           rm -f $at_times_file
+          fi
          echo "$at_log_msg" >> $at_group_log
          echo "$at_log_msg" >&AS_MESSAGE_LOG_FD
 
@@ -821,7 +821,7 @@
   *) at_result="$at_result
 $at_skip_count tests were skipped." ;;
 esac
- 
+
 if test $at_unexpected_count = 0; then
   echo "$at_result"
   echo "$at_result" >&AS_MESSAGE_LOG_FD
@@ -992,7 +992,7 @@
 # $at_arg_OPTION will be set to `:' if this option is received, `false' if
 # if --noOPTION is received, and `false' by default.
 #
-# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with 
+# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with
 # $at_optarg set to `:' or `false' as appropriate.  $opt_arg is actually
 # just a copy of $at_arg_OPTION.
 #
@@ -1013,7 +1013,7 @@
 # variable $at_arg_OPTION, where OPTION is the first option in OPTIONS with
 # any `-' characters replaced with `_'.
 #
-# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with 
+# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with
 # $at_optarg set.  $at_optarg is actually just a copy of $at_arg_OPTION.
 #
 # ACTION-IF-NOT-GIVEN will be run once after option parsing is complete
@@ -1059,7 +1059,7 @@
 m4_define([AT_XFAIL_IF],
 [dnl
 dnl Try to limit the amount of conditionals that we emit.
-m4_case([$1], 
+m4_case([$1],
       [], [],
       [false], [],
       [:], [m4_define([AT_xfail], [at_xfail=yes])],
@@ -1079,9 +1079,8 @@
 # ----------
 # Complete a group of related tests.
 m4_define([AT_CLEANUP],
-[m4_append([AT_help],
-at_help_all=$at_help_all'm4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);m4_ifdef([AT_keywords],
 [m4_defn([AT_keywords])]);
-'
+[m4_append([AT_help_all],
+m4_defn([AT_ordinal]);m4_defn([AT_line]);m4_defn([AT_description]);m4_ifdef([AT_keywords],
 [m4_defn([AT_keywords])]);
 )dnl
 m4_divert_pop([TEST_SCRIPT])dnl Back to TESTS
     AT_xfail
@@ -1090,7 +1089,7 @@
       $at_traceon
 m4_undivert([TEST_SCRIPT])dnl Insert the code here
       $at_traceoff
-      $at_times_skip || times >$at_times_file
+      $at_times_p && times >$at_times_file
     ) AS_MESSAGE_LOG_FD>&1 2>&1 | eval $at_tee_pipe
     at_status=`cat $at_status_file`
     ;;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]