autoconf-patches
[Top][All Lists]
Advanced

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

40-at-data-files.patch


From: DEMAILLE Akim
Subject: 40-at-data-files.patch
Date: Mon, 20 Nov 2000 10:18:27 +0100

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * tests/atgeneral.m4 (AT_CLEANUP): Factor the computation of
        at_test_count into...
        (AT_INIT): here.
        Use an sh variable, at_data_files, instead of an hard coded list.

Index: tests/atgeneral.m4
--- tests/atgeneral.m4 Sat, 18 Nov 2000 19:19:30 +0100 akim 
(ace/b/19_atgeneral. 1.30 644)
+++ tests/atgeneral.m4 Sat, 18 Nov 2000 19:35:14 +0100 akim 
(ace/b/19_atgeneral. 1.30 644)
@@ -158,6 +158,7 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
 m4_divert_pop[]dnl
 m4_divert_push(3)[]dnl
   esac
+  at_test_count=`expr 1 + $at_test_count`
   $at_verbose $at_n "     $test. $srcdir/`cat at-setup-line`: $at_c"
   case $at_status in
     0) echo ok
@@ -167,11 +168,10 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
         ;;
     *) echo "FAILED near \``cat at-check-line`'"
        at_failed_list="$at_failed_list $test"
+       $at_stop_on_error && break
        ;;
   esac
-  if $at_stop_on_error && test -n "$at_failed_list"; then
-   break
-  fi
+  $at_debug || rm -rf $at_data_files
 done

 # Wrap up the testing suite with summary statistics.
@@ -251,8 +251,9 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
 m4_pushdef([AT_data_files], [stdout stderr ])
 m4_divert_pop()dnl
   AT_ordinal )
-dnl Here will be inserted the `rm' corresponding to AT_CLEANUP.
+dnl Here will be inserted the definition of at_data_files.
 m4_divert(2)[]dnl
+    rm -rf $at_data_files
     echo AT_LINE > at-setup-line
     $at_verbose 'testing $1'
     $at_verbose $at_n "     $at_c"
@@ -300,13 +301,9 @@ m4_define([AT_UNDEFINE], m4_defn([m4_und
       $at_traceoff
     )
     at_status=$?
-    at_test_count=`expr 1 + $at_test_count`
-    if $at_stop_on_error && test -n "$at_failed_list"; then :; else
-      rm -rf AT_data_files
-    fi
     ;;
 m4_divert(1)[]dnl
-    rm -rf AT_data_files
+    at_data_files="AT_data_files"
 m4_undivert(2)[]dnl
 m4_popdef([AT_data_files])dnl
 m4_divert_push([KILL])dnl



reply via email to

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