diff options
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | regress/test-exec.sh | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 4ce13e7f8..4f514c8db 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -671,6 +671,7 @@ unit: regress-unit-binaries | |||
671 | interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | 671 | interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) |
672 | BUILDDIR=`pwd`; \ | 672 | BUILDDIR=`pwd`; \ |
673 | cd $(srcdir)/regress || exit $$?; \ | 673 | cd $(srcdir)/regress || exit $$?; \ |
674 | EGREP='@EGREP@' \ | ||
674 | $(MAKE) \ | 675 | $(MAKE) \ |
675 | .OBJDIR="$${BUILDDIR}/regress" \ | 676 | .OBJDIR="$${BUILDDIR}/regress" \ |
676 | .CURDIR="`pwd`" \ | 677 | .CURDIR="`pwd`" \ |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 62f5dfc46..bfe8783fe 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -23,6 +23,16 @@ else | |||
23 | PORT=4242 | 23 | PORT=4242 |
24 | fi | 24 | fi |
25 | 25 | ||
26 | # If configure tells us to use a different egrep, create a wrapper function | ||
27 | # to call it. This means we don't need to change all the tests that depend | ||
28 | # on a good implementation. | ||
29 | if test "x${EGREP}" != "x"; then | ||
30 | egrep () | ||
31 | { | ||
32 | ${EGREP} "$@" | ||
33 | } | ||
34 | fi | ||
35 | |||
26 | if [ -x /usr/ucb/whoami ]; then | 36 | if [ -x /usr/ucb/whoami ]; then |
27 | USER=`/usr/ucb/whoami` | 37 | USER=`/usr/ucb/whoami` |
28 | elif whoami >/dev/null 2>&1; then | 38 | elif whoami >/dev/null 2>&1; then |