summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2020-04-22 11:33:15 +1000
committerDarren Tucker <dtucker@dtucker.net>2020-04-22 11:35:49 +1000
commit300c4322b92e98d3346efa0aec1c094c94d0f964 (patch)
treedeb4a9b9f00d32d51879a4bfc60bed93e4c47c64
parentc8d9796cfe046f00eb8b2096d2b7028d6a523a84 (diff)
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).
-rw-r--r--Makefile.in1
-rw-r--r--regress/test-exec.sh10
2 files changed, 11 insertions, 0 deletions
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