From: Eric Blake <ebb9@byu.net>
Date: Wed, 23 Jan 2008 17:03:58 +0000 (-0700)
Subject: Fix color.test when using BSD grep.
X-Git-Tag: v1.10b~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce864ac1b0bf920739d28f6cc574b48bf7d3bfb2;p=thirdparty%2Fautomake.git

Fix color.test when using BSD grep.

* tests/color.test: Ensure that grep can handle non-printing
characters.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index 605dd9233..649e9ac7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23  Eric Blake  <ebb9@byu.net>
+
+	Fix color.test when using BSD grep.
+	* tests/color.test: Ensure that grep can handle non-printing
+	characters.
+
 2008-01-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* tests/lisp3.test: Fix typo.
diff --git a/tests/color.test b/tests/color.test
index 5b51287a6..dd4ded590 100755
--- a/tests/color.test
+++ b/tests/color.test
@@ -29,6 +29,14 @@ lgn=''
 blu=''
 std=''
 
+# Check that grep can parse nonprinting characters.
+# BSD 'grep' works from a pipe, but not a seekable file.
+# GNU or BSD 'grep -a' works on files, but is not portable.
+case `echo "$std" | grep .` in
+  $std) ;;
+  *) exit 77 ;;
+esac
+
 cat >>configure.in <<END
 AC_OUTPUT
 END
@@ -66,20 +74,22 @@ $AUTOCONF
 
 test_color ()
 {
-  grep ": pass" stdout | $FGREP "$grn"
-  grep ": fail" stdout | $FGREP "$red"
-  grep ": xfail" stdout | $FGREP "$lgn"
-  grep ": xpass" stdout | $FGREP "$red"
-  grep ": skip" stdout | $FGREP "$blu"
+  # Not a useless use of cat; see above comments about grep.
+  cat stdout | grep ": pass" | $FGREP "$grn"
+  cat stdout | grep ": fail" | $FGREP "$red"
+  cat stdout | grep ": xfail" | $FGREP "$lgn"
+  cat stdout | grep ": xpass" | $FGREP "$red"
+  cat stdout | grep ": skip" | $FGREP "$blu"
 }
 
 test_no_color ()
 {
-  grep ": pass" stdout | $FGREP "$grn" && exit 1
-  grep ": fail" stdout | $FGREP "$red" && exit 1
-  grep ": xfail" stdout | $FGREP "$lgn" && exit 1
-  grep ": xpass" stdout | $FGREP "$red" && exit 1
-  grep ": skip" stdout | $FGREP "$blu" && exit 1
+  # Not a useless use of cat; see above comments about grep.
+  cat stdout | grep ": pass" | $FGREP "$grn" && exit 1
+  cat stdout | grep ": fail" | $FGREP "$red" && exit 1
+  cat stdout | grep ": xfail" | $FGREP "$lgn" && exit 1
+  cat stdout | grep ": xpass" | $FGREP "$red" && exit 1
+  cat stdout | grep ": skip" | $FGREP "$blu" && exit 1
   :
 }