From: Akim Demaille <akim@epita.fr>
Date: Thu, 21 Sep 2000 13:06:03 +0000 (+0000)
Subject: * src/atgeneral.m4 (AC_CHECK): Display stderr including when the
X-Git-Tag: autoconf-2.50~614
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af51198638fdadbc8a732aa483666cb8ebea35ff;p=thirdparty%2Fautoconf.git

* src/atgeneral.m4 (AC_CHECK): Display stderr including when the
test failed because of stdout.
---

diff --git a/ChangeLog b/ChangeLog
index cb84e7cdd..1b7bf3dfd 100644
--- 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 5bba64a04..9f1404be5 100644
--- 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 5bba64a04..9f1404be5 100644
--- 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