36-kill-skip.patch

[DEMAILLE Akim]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * tests/atgeneral.m4 (AT_SETUP): Don't build at-check-line, that's
        AT_CHECK's job.
        Remove the code depending upon `at_skip_mode': it's unused.
        
        
Index: tests/atgeneral.m4
--- tests/atgeneral.m4 Sat, 18 Nov 2000 17:16:33 +0100 akim 
(ace/b/19_atgeneral. 1.25 644)
+++ tests/atgeneral.m4 Sat, 18 Nov 2000 17:24:21 +0100 akim 
(ace/b/19_atgeneral. 1.25 644)
@@ -259,20 +259,19 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
 m4_divert_pop()dnl
   AT_ordinal )
     if $at_stop_on_error && test -n "$at_failed_list"; then :; else
+dnl Here will be inserted the `rm' corresponding to AT_CLEANUP.
 m4_divert(2)[]dnl
-    echo AT_LINE > at-check-line
-    echo AT_LINE > at-setup-line
-    if $at_verbose; then
+      echo AT_LINE > at-setup-line
+      if $at_verbose; then
        echo 'testing $1'
        echo $at_n "     $at_c"
-    fi
-    if $at_verbose; then
-       echo "AT_ordinal. $srcdir/AT_LINE..."
-    else
-       echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE                       
     , 0, 30)[]$at_c"
-    fi
-    if test -z "$at_skip_mode"; then
-       (
+      fi
+      if $at_verbose; then
+        echo "AT_ordinal. $srcdir/AT_LINE..."
+      else
+         echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE                     
       , 0, 30)[]$at_c"
+      fi
+      (
 $at_traceon
 ])
 
@@ -284,19 +283,15 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
 # nor files created with AT_DATA.
 AT_DEFINE([AT_CLEANUP],
 $at_traceoff
-[      )
-       at_status=$?
-      else
-        echo 'ignored (skipped)'
-        at_ignore_count=`expr $at_ignore_count + 1`
-      fi
+[      )
+      at_status=$?
       at_test_count=`expr 1 + $at_test_count`
       if $at_stop_on_error && test -n "$at_failed_list"; then :; else
 m4_divert(1)[]dnl
 
     rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ 
$1])]) stdout stderr[]AT_data_expout[]AT_data_experr
 m4_undivert(2)[]dnl
-    rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ 
$1])]) stdout stderr[]AT_data_expout[]AT_data_experr
+        rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , 
, [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
       fi
     fi
     ;;