* tests/atgeneral.m4 (AT_INIT): Register at-setup-line and

at-check-line for removal.
Check for the presence of at-check-line only when $at_test was
really a test.
Reported by Pavel.

diff --git a/ChangeLog b/ChangeLog
index 1eb78cb3409d5f34a700bdc90a0ce3efa59ede5b..34accddd66be6060d31919c288c94eae49c3fc61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * tests/atgeneral.m4 (AT_INIT): Register at-setup-line and
+       at-check-line for removal.
+       Check for the presence of at-check-line only when $at_test was
+       really a test.
+       Reported by Pavel.
+
 2001-03-04  Pavel Roskin  <proski@gnu.org>
 
        * tests/atgeneral.m4 (AT_INIT): s/am_me/as_me/. Quote AT_CHECK

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 38fa7c479043ee7923f95d46cc39c8d0c10c037a..106b98122bf909d8baf9d5b18323b111edd87da3 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -89,7 +89,8 @@ m4_define([AT_INIT],
 [m4_define([AT_ordinal], 0)
 m4_define([AT_banner_ordinal], 0)
 m4_define([AT_data_files],
-          [stdout expout at-stdout stderr experr at-stder1 at-stderr ])
+          [stdout expout at-setup-line at-check-line at-stdout stderr experr
+           at-stder1 at-stderr ])
 m4_divert_push([DEFAULT])dnl
 #! /bin/sh
 
@@ -225,17 +226,17 @@ m4_divert([TAIL])[]dnl
     continue
     ;;
   esac
-  if test ! -f at-check-line; then
-    echo "$as_me: warning: no at-check-line which means a failure happened"
-    echo "$as_me: warning: in a [AT_SETUP/AT_CLEANUP] pair before any"
-    echo "$as_me: warning: [AT_CHECK] could be run.  This test suite is"
-    echo "$as_me: warning: improperly designed, please report to"
-    echo "$as_me: warning: <$at_bugreport>."
-    cp at-setup-line at-check-line
-  fi
   case $at_test in
     banner-*) ;;
     *)
+      if test ! -f at-check-line; then
+       echo "$as_me: warning: no at-check-line which means a failure happened"
+       echo "$as_me: warning: in a [AT_SETUP/AT_CLEANUP] pair before any"
+       echo "$as_me: warning: [AT_CHECK] could be run.  This test suite is"
+       echo "$as_me: warning: improperly designed, please report to"
+       echo "$as_me: warning: <$at_bugreport>."
+       cp at-setup-line at-check-line
+      fi
       at_test_count=`expr 1 + $at_test_count`
       $at_verbose $at_n "$at_test. $srcdir/`cat at-setup-line`: $at_c"
       case $at_status in

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 38fa7c479043ee7923f95d46cc39c8d0c10c037a..106b98122bf909d8baf9d5b18323b111edd87da3 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -89,7 +89,8 @@ m4_define([AT_INIT],
 [m4_define([AT_ordinal], 0)
 m4_define([AT_banner_ordinal], 0)
 m4_define([AT_data_files],
-          [stdout expout at-stdout stderr experr at-stder1 at-stderr ])
+          [stdout expout at-setup-line at-check-line at-stdout stderr experr
+           at-stder1 at-stderr ])
 m4_divert_push([DEFAULT])dnl
 #! /bin/sh
 
@@ -225,17 +226,17 @@ m4_divert([TAIL])[]dnl
     continue
     ;;
   esac
-  if test ! -f at-check-line; then
-    echo "$as_me: warning: no at-check-line which means a failure happened"
-    echo "$as_me: warning: in a [AT_SETUP/AT_CLEANUP] pair before any"
-    echo "$as_me: warning: [AT_CHECK] could be run.  This test suite is"
-    echo "$as_me: warning: improperly designed, please report to"
-    echo "$as_me: warning: <$at_bugreport>."
-    cp at-setup-line at-check-line
-  fi
   case $at_test in
     banner-*) ;;
     *)
+      if test ! -f at-check-line; then
+       echo "$as_me: warning: no at-check-line which means a failure happened"
+       echo "$as_me: warning: in a [AT_SETUP/AT_CLEANUP] pair before any"
+       echo "$as_me: warning: [AT_CHECK] could be run.  This test suite is"
+       echo "$as_me: warning: improperly designed, please report to"
+       echo "$as_me: warning: <$at_bugreport>."
+       cp at-setup-line at-check-line
+      fi
       at_test_count=`expr 1 + $at_test_count`
       $at_verbose $at_n "$at_test. $srcdir/`cat at-setup-line`: $at_c"
       case $at_status in