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 supported malloc options to connect-privsep. 

This allows us to activate only the supported options during the malloc
option portion of the connect-privsep test.
This commit is contained in:
Darren Tucker 2016-03-14 16:04:23 +11:00
parent d29c5b9b3e
commit 732b463d37
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -552,6 +552,7 @@ tests interop-tests t-exec: regress-prep regress-binaries $(TARGETS)
OBJ="$${BUILDDIR}/regress/" \ OBJ="$${BUILDDIR}/regress/" \
PATH="$${BUILDDIR}:$${PATH}" \ PATH="$${BUILDDIR}:$${PATH}" \
TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_SSH_SCP="$${TEST_SSH_SCP}" \ TEST_SSH_SCP="$${TEST_SSH_SCP}" \
TEST_SSH_SSH="$${TEST_SSH_SSH}" \ TEST_SSH_SSH="$${TEST_SSH_SSH}" \
TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \

7
regress/connect-privsep.sh
View File

@ -26,7 +26,12 @@ done
# Because sandbox is sensitive to changes in libc, especially malloc, retest # Because sandbox is sensitive to changes in libc, especially malloc, retest
# with every malloc.conf option (and none). # with every malloc.conf option (and none).
for m in '' A F G H J P R S X '<' '>'; do if [ -z "TEST_MALLOC_OPTIONS" ]; then
mopts="A F G H J P R S X < >"
else
mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'`
fi
for m in '' $mopts ; do
for p in ${SSH_PROTOCOLS}; do for p in ${SSH_PROTOCOLS}; do
env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then