Clean up MALLOC_OPTIONS. For the unittests, move MALLOC_OPTIONS and

TEST_ENV to unittets/Makefile.inc.

ok otto

10 files changed, 15 insertions, 26 deletions

diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile
index f52f6798556..6b650de3d0b 100644
--- a/regress/usr.bin/ssh/Makefile
+++ b/regress/usr.bin/ssh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.92 2016/10/31 23:45:08 tb Exp $
+#	$OpenBSD: Makefile,v 1.93 2016/11/01 13:43:27 tb Exp $
 
 .ifndef SKIP_UNIT
 SUBDIR=		unittests
@@ -105,7 +105,7 @@ CLEANFILES+=	*.core actual agent-key.* authorized_keys_${USERNAME} \
 SUDO_CLEAN+=	/var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME}
 
 # Enable all malloc(3) randomisations and checks
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+TEST_ENV=      "MALLOC_OPTIONS=CFGJRSUX"
 
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
diff --git a/regress/usr.bin/ssh/connect-privsep.sh b/regress/usr.bin/ssh/connect-privsep.sh
index 782c0375626..0ce6977f6ab 100644
--- a/regress/usr.bin/ssh/connect-privsep.sh
+++ b/regress/usr.bin/ssh/connect-privsep.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: connect-privsep.sh,v 1.7 2016/10/31 23:45:08 tb Exp $
+#	$OpenBSD: connect-privsep.sh,v 1.8 2016/11/01 13:43:27 tb Exp $
 #	Placed in the Public Domain.
 
 tid="proxy connect with privsep"
@@ -25,7 +25,7 @@ done
 
 # Because sandbox is sensitive to changes in libc, especially malloc, retest
 # with every malloc.conf option (and none).
-for m in '' F G H J R S X '<' '>'; do
+for m in '' C F G J R S U X '<' '>'; 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
diff --git a/regress/usr.bin/ssh/unittests/Makefile.inc b/regress/usr.bin/ssh/unittests/Makefile.inc
index 34b7993a61b..74f7fe7d42c 100644
--- a/regress/usr.bin/ssh/unittests/Makefile.inc
+++ b/regress/usr.bin/ssh/unittests/Makefile.inc
@@ -1,10 +1,13 @@
-#	$OpenBSD: Makefile.inc,v 1.8 2016/09/30 11:55:20 bluhm Exp $
+#	$OpenBSD: Makefile.inc,v 1.9 2016/11/01 13:43:27 tb Exp $
 
 REGRESS_FAIL_EARLY?=	yes
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
 
+MALLOC_OPTIONS?=	CFGJRSUX
+TEST_ENV?=		MALLOC_OPTIONS=${MALLOC_OPTIONS}
+
 # XXX detect from ssh binary?
 SSH1?=		no
 OPENSSL?=	yes
diff --git a/regress/usr.bin/ssh/unittests/bitmap/Makefile b/regress/usr.bin/ssh/unittests/bitmap/Makefile
index b3b7d12c705..bd21949f8b5 100644
--- a/regress/usr.bin/ssh/unittests/bitmap/Makefile
+++ b/regress/usr.bin/ssh/unittests/bitmap/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_bitmap
 SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/hostkeys/Makefile b/regress/usr.bin/ssh/unittests/hostkeys/Makefile
index 43968c70103..ae3c342bdbd 100644
--- a/regress/usr.bin/ssh/unittests/hostkeys/Makefile
+++ b/regress/usr.bin/ssh/unittests/hostkeys/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.c
diff --git a/regress/usr.bin/ssh/unittests/kex/Makefile b/regress/usr.bin/ssh/unittests/kex/Makefile
index e268daad2be..7ed312675c8 100644
--- a/regress/usr.bin/ssh/unittests/kex/Makefile
+++ b/regress/usr.bin/ssh/unittests/kex/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c
diff --git a/regress/usr.bin/ssh/unittests/match/Makefile b/regress/usr.bin/ssh/unittests/match/Makefile
index 3197ece990c..bd4aed8446c 100644
--- a/regress/usr.bin/ssh/unittests/match/Makefile
+++ b/regress/usr.bin/ssh/unittests/match/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2016/10/31 23:45:09 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_match
 SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/sshbuf/Makefile b/regress/usr.bin/ssh/unittests/sshbuf/Makefile
index 2926c32a3e7..54f227eec6b 100644
--- a/regress/usr.bin/ssh/unittests/sshbuf/Makefile
+++ b/regress/usr.bin/ssh/unittests/sshbuf/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2016/10/31 23:45:09 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.5 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_sshbuf
 SRCS=tests.c
diff --git a/regress/usr.bin/ssh/unittests/sshkey/Makefile b/regress/usr.bin/ssh/unittests/sshkey/Makefile
index 8411aec5124..3b1752d66bc 100644
--- a/regress/usr.bin/ssh/unittests/sshkey/Makefile
+++ b/regress/usr.bin/ssh/unittests/sshkey/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-
-TEST_ENV=      "MALLOC_OPTIONS=FGJRX"
+#	$OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
diff --git a/regress/usr.bin/ssh/unittests/utf8/Makefile b/regress/usr.bin/ssh/unittests/utf8/Makefile
index 85cf7b81fc0..a975264fc14 100644
--- a/regress/usr.bin/ssh/unittests/utf8/Makefile
+++ b/regress/usr.bin/ssh/unittests/utf8/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $
-
-TEST_ENV=	"MALLOC_OPTIONS=CFGJRSUX"
+#	$OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $
 
 PROG=test_utf8
 SRCS=tests.c