summaryrefslogtreecommitdiff
path: root/regress/connect-privsep.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-03-14 16:04:23 +1100
committerDarren Tucker <dtucker@zip.com.au>2016-03-14 16:04:23 +1100
commit732b463d37221722b1206f43aa59563766a6a968 (patch)
tree5780e15c7a2bcbeb18c8e82c2ccada23263f33d8 /regress/connect-privsep.sh
parentd29c5b9b3e9f27394ca97a364ed4bb4a55a59744 (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.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index 9a51f569..ea739f61 100644
--- a/regress/connect-privsep.sh
+++ b/regress/connect-privsep.sh
@@ -26,7 +26,12 @@ done
# Because sandbox is sensitive to changes in libc, especially malloc, retest
# 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
env MALLOC_OPTIONS="$m" ${SSH} -$p -F $OBJ/ssh_proxy 999.999.999.999 true
if [ $? -ne 0 ]; then