tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Darren Tucker 2020-04-22 11:33:15 +10:00
parent c8d9796cfe
commit 300c4322b9
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -671,6 +671,7 @@ unit: regress-unit-binaries
interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
BUILDDIR=`pwd`; \ BUILDDIR=`pwd`; \
cd $(srcdir)/regress || exit $$?; \ cd $(srcdir)/regress || exit $$?; \
EGREP='@EGREP@' \
$(MAKE) \ $(MAKE) \
.OBJDIR="$${BUILDDIR}/regress" \ .OBJDIR="$${BUILDDIR}/regress" \
.CURDIR="`pwd`" \ .CURDIR="`pwd`" \

10
regress/test-exec.sh
View File

@ -23,6 +23,16 @@ else
PORT=4242 PORT=4242
fi 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 if [ -x /usr/ucb/whoami ]; then
USER=`/usr/ucb/whoami` USER=`/usr/ucb/whoami`
elif whoami >/dev/null 2>&1; then elif whoami >/dev/null 2>&1; then