* tests/atgeneral.m4 (AT_CHECK): Warn if the expected exit status

        is different from what we got. Don't preserve exit status other
        than 77.

diff --git a/ChangeLog b/ChangeLog
index b06b6dc826c67cf1805f460198c7835e0a9d5341..165274f9f537e3f5ad9ab5acaa8aee4fddd48d18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-29  Pavel Roskin  <proski@gnu.org>
+
+       * tests/atgeneral.m4 (AT_CHECK): Warn if the expected exit status
+       is different from what we got. Don't preserve exit status other
+       than 77.
+
 2000-10-29  Pavel Roskin  <proski@gnu.org>
 
        * autoconf.sh: When scanning for unexpanded macros match only

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 941b7e8046364793b788013c9a0a84b0cfc8be67..0d1cc0a4fe059234be98ea532dabb111b5baf975 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -372,10 +372,12 @@ $1
 ifelse([$2], [], [],
 [at_status=$?
 if test $at_status != $2; then
+  $at_verbose && echo "Exit code was $at_status, expected $2" >&6
 dnl Maybe there was an important message to read before it died.
   $at_verbose && $at_check_stds && cat stderr >&6
-dnl Exit with the same code, at least to preserve 77.
-  exit $at_status
+dnl Preserve exit code 77.
+  test $at_status = 77 && exit 77
+  exit 1
 fi
 ])dnl
 $at_traceoff

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 941b7e8046364793b788013c9a0a84b0cfc8be67..0d1cc0a4fe059234be98ea532dabb111b5baf975 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -372,10 +372,12 @@ $1
 ifelse([$2], [], [],
 [at_status=$?
 if test $at_status != $2; then
+  $at_verbose && echo "Exit code was $at_status, expected $2" >&6
 dnl Maybe there was an important message to read before it died.
   $at_verbose && $at_check_stds && cat stderr >&6
-dnl Exit with the same code, at least to preserve 77.
-  exit $at_status
+dnl Preserve exit code 77.
+  test $at_status = 77 && exit 77
+  exit 1
 fi
 ])dnl
 $at_traceoff