* src/atgeneral.m4 (AC_CHECK): Display stderr including when the

test failed because of stdout.

diff --git a/ChangeLog b/ChangeLog
index cb84e7cddaa6d4197d14e289b8b5cf6d9c2594f1..1b7bf3dfd8a38f22c2ab45a711e772a74c729caa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-21  Akim Demaille  <akim@epita.fr>
+
+       * src/atgeneral.m4 (AC_CHECK): Display stderr including when the
+       test failed because of stdout.
+
 2000-09-21  Akim Demaille  <akim@epita.fr>
 
        * tests/atgeneral.m4: Formatting changes.

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 5bba64a0490f83302bc2f9356824bf6267f7f42e..9f1404be5fcc81b876b33c1538ff0d8c7734847b 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -384,18 +384,20 @@ dnl Restore stdout to fd1 and stderr to fd2.
   exec 1>&5 2>&6
 dnl If not verbose, neutralize the output of diff.
   $at_verbose || exec 1>/dev/null 2>/dev/null
+  at_failed=false;
   AT_CASE([$3],
           ignore, [$at_verbose && cat stdout;:],
           expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
-$at_diff expout stdout || exit 1],
-          [], [$at_diff empty stdout || exit 1],
-          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || exit 1])
+$at_diff expout stdout || at_failed=:],
+          [], [$at_diff empty stdout || at_failed=:],
+          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || at_failed=:])
   AT_CASE([$4],
           ignore, [$at_verbose && cat stderr;:],
           experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
-$at_diff experr stderr || exit 1],
-          [], [$at_diff empty stderr || exit 1],
-          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || exit 1])
+$at_diff experr stderr || at_failed=:],
+          [], [$at_diff empty stderr || at_failed=:],
+          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
+  $at_failed && exit 1
 fi
 $at_traceon
 ])# AT_CHECK

diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 5bba64a0490f83302bc2f9356824bf6267f7f42e..9f1404be5fcc81b876b33c1538ff0d8c7734847b 100644 (file)
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -384,18 +384,20 @@ dnl Restore stdout to fd1 and stderr to fd2.
   exec 1>&5 2>&6
 dnl If not verbose, neutralize the output of diff.
   $at_verbose || exec 1>/dev/null 2>/dev/null
+  at_failed=false;
   AT_CASE([$3],
           ignore, [$at_verbose && cat stdout;:],
           expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
-$at_diff expout stdout || exit 1],
-          [], [$at_diff empty stdout || exit 1],
-          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || exit 1])
+$at_diff expout stdout || at_failed=:],
+          [], [$at_diff empty stdout || at_failed=:],
+          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || at_failed=:])
   AT_CASE([$4],
           ignore, [$at_verbose && cat stderr;:],
           experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
-$at_diff experr stderr || exit 1],
-          [], [$at_diff empty stderr || exit 1],
-          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || exit 1])
+$at_diff experr stderr || at_failed=:],
+          [], [$at_diff empty stderr || at_failed=:],
+          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
+  $at_failed && exit 1
 fi
 $at_traceon
 ])# AT_CHECK