On 10/22/2012 04:21 AM, Petr Sumbera wrote: > Can we update also tests/init.cfg to use $GREP version found during configure? > Or eventually remove this check..
Thanks, I'd rather do the latter, so I installed this: >From 46d3ec2adf4667cbcb6b2181512c45d2fbca85dc Mon Sep 17 00:00:00 2001 From: Paul Eggert <egg...@cs.ucla.edu> Date: Wed, 24 Oct 2012 15:37:01 -0700 Subject: [PATCH] tests: exercise the grep -e portability fix Remove workaround for Solaris, since the bug should be fixed now. Suggested by Petr Sumbera in <http://lists.gnu.org/archive/html/bug-gzip/2012-10/msg00005.html>. * tests/zgrep-context, tests/zgrep-f: All uses removed. * tests/init.cfg (require_POSIX_grep_): Remove. --- tests/init.cfg | 15 --------------- tests/zgrep-context | 2 -- tests/zgrep-f | 2 -- 3 files changed, 19 deletions(-) diff --git a/tests/init.cfg b/tests/init.cfg index 5adfc9b..901209c 100644 --- a/tests/init.cfg +++ b/tests/init.cfg @@ -3,18 +3,3 @@ # This goes hand in hand with the "exec 9>&2;" in Makefile.am's # TESTS_ENVIRONMENT definition. stderr_fileno_=9 - -require_POSIX_grep_() -{ - # Ensure that grep's -f and -E options works. - # On Solaris 5.11, "grep -f" prints this: - # grep: illegal option -- f - # Usage: grep -hblcnsviw pattern file . . . - # Similar for grep -E. - - : | grep -f /dev/null - test $? = 1 || skip_ 'your grep lacks support for -f -' - - grep -E foo /dev/null - test $? = 1 || skip_ 'your grep lacks support for -E' -} diff --git a/tests/zgrep-context b/tests/zgrep-context index 1a15fa8..fc40aa0 100755 --- a/tests/zgrep-context +++ b/tests/zgrep-context @@ -19,8 +19,6 @@ . "${srcdir=.}/init.sh"; path_prepend_ .. -require_POSIX_grep_ - # A limited replacement for seq: handle 1 or 2 args; increment must be 1 seq() { diff --git a/tests/zgrep-f b/tests/zgrep-f index c494706..4e9ccd0 100755 --- a/tests/zgrep-f +++ b/tests/zgrep-f @@ -20,8 +20,6 @@ . "${srcdir=.}/init.sh"; path_prepend_ .. -require_POSIX_grep_ - echo needle > n || framework_failure_ echo needle > haystack || framework_failure_ gzip haystack || framework_failure_ -- 1.7.11.7
