diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 16:04:23 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-03-14 16:04:23 +1100 |
commit | 732b463d37221722b1206f43aa59563766a6a968 (patch) | |
tree | 5780e15c7a2bcbeb18c8e82c2ccada23263f33d8 /regress/connect-privsep.sh | |
parent | d29c5b9b3e9f27394ca97a364ed4bb4a55a59744 (diff) |
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.
Diffstat (limited to 'regress/connect-privsep.sh')
-rw-r--r-- | regress/connect-privsep.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh index 9a51f5690..ea739f614 100644 --- a/regress/connect-privsep.sh +++ b/regress/connect-privsep.sh | |||
@@ -26,7 +26,12 @@ done | |||
26 | 26 | ||
27 | # Because sandbox is sensitive to changes in libc, especially malloc, retest | 27 | # Because sandbox is sensitive to changes in libc, especially malloc, retest |
28 | # with every malloc.conf option (and none). | 28 | # with every malloc.conf option (and none). |
29 | for m in '' A F G H J P R S X '<' '>'; do | 29 | if [ -z "TEST_MALLOC_OPTIONS" ]; then |
30 | mopts="A F G H J P R S X < >" | ||
31 | else | ||
32 | mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'` | ||
33 | fi | ||
34 | for m in '' $mopts ; do | ||
30 | for p in ${SSH_PROTOCOLS}; do | 35 | for p in ${SSH_PROTOCOLS}; do |
31 | env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true | 36 | env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true |
32 | if [ $? -ne 0 ]; then | 37 | if [ $? -ne 0 ]; then |