[openssh-commits] [openssh] 03/03: Pass configure's egrep through to test-exec.sh.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 300c4322b92e98d3346efa0aec1c094c94d0f964
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Wed Apr 22 11:33:15 2020 +1000

    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).
---
 Makefile.in          |  1 +
 regress/test-exec.sh | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 4ce13e7f..4f514c8d 100644
--- 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 62f5dfc4..bfe8783f 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.