Clean up MALLOC_OPTIONS. For the unittests, move MALLOC_OPTIONS and

TEST_ENV to unittets/Makefile.inc.

ok otto

8 files changed, 11 insertions, 22 deletions

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