Pass configure's egrep through to test-exec.sh.

Use it to create a wrapper function to call it from tests.  Fixes the
keygen-comment test on platforms with impoverished default egrep (eg
Solaris).

diff --git a/Makefile.in b/Makefile.in
index 4ce13e7f8d71c70934fa0e098fa4e018a7479778..4f514c8db5e1e1b12ef72c01f315e312063bf5e8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -671,6 +671,7 @@ unit: regress-unit-binaries
 interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
        BUILDDIR=`pwd`; \
        cd $(srcdir)/regress || exit $$?; \
+       EGREP='@EGREP@' \
        $(MAKE) \
                .OBJDIR="$${BUILDDIR}/regress" \
                .CURDIR="`pwd`" \

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 62f5dfc46343fac3f47c0ce69518bff8647e82af..bfe8783fedb95ee6dc32b118fe87d93011473c1f 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -23,6 +23,16 @@ else
        PORT=4242
 fi
 
+# If configure tells us to use a different egrep, create a wrapper function
+# to call it.  This means we don't need to change all the tests that depend
+# on a good implementation.
+if test "x${EGREP}" != "x"; then
+       egrep ()
+{
+        ${EGREP} "$@"
+}
+fi
+
 if [ -x /usr/ucb/whoami ]; then
        USER=`/usr/ucb/whoami`
 elif whoami >/dev/null 2>&1; then