mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-26 20:02:13 +00:00
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).
This commit is contained in:
parent
c8d9796cfe
commit
300c4322b9
@ -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`" \
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user