From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Mar 2012 22:22:54 +0000 (-0800)
Subject: tests: fix port of AT_CHECK_ENV to hosts with flaky grep
X-Git-Tag: v2.69~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7476d52c456edbda9c79d9a452ddeb450c55331;p=thirdparty%2Fautoconf.git

tests: fix port of AT_CHECK_ENV to hosts with flaky grep

* tests/local.at (AT_CHECK_ENV): Don't copy the buggy grep's
diagnostics to stderr, as that causes AT_CHECK to fail.  They can
be found in the stderr-* files if this is needed for debugging.
---

diff --git a/tests/local.at b/tests/local.at
index 66027e83..40b73185 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -331,10 +331,7 @@ if test -f state-env.before && test -f state-env.after; then
       # There may be variables spread on several lines; remove latter lines.
       $GREP '^m4_defn([m4_re_word])=' >clean-$act_file ||
         test $? -eq 1 || grep_failed=:
-    if test -s stderr-$act_file; then
-      cat stderr-$act_file >&2
-      grep_failed=:
-    fi
+    test -s stderr-$act_file && grep_failed=:
   done
   $at_traceon
   $grep_failed || $at_diff clean-state-env.before clean-state-env.after