upstream commit
Clean up MALLOC_OPTIONS. For the unittests, move
MALLOC_OPTIONS and TEST_ENV to unittets/Makefile.inc.
ok otto
Upstream-Regress-ID: 890d497e0a38eeddfebb11cc429098d76cf29f12
diff --git a/regress/Makefile b/regress/Makefile
index bc15557..1f71761 100644
--- a/regress/Makefile
+++ b/regress/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 $
REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
tests: prep $(REGRESS_TARGETS)
@@ -116,7 +116,7 @@
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"
TEST_SSH_SSHKEYGEN?=ssh-keygen
diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh
index edfdbf0..81cedc7 100644
--- a/regress/connect-privsep.sh
+++ b/regress/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"
@@ -27,7 +27,7 @@
# Because sandbox is sensitive to changes in libc, especially malloc, retest
# with every malloc.conf option (and none).
if [ -z "TEST_MALLOC_OPTIONS" ]; then
- mopts="F G H J R S X < >"
+ mopts="C F G J R S U X < >"
else
mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'`
fi
diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 20d32a7..3d9eaba 100644
--- a/regress/unittests/Makefile.inc
+++ b/regress/unittests/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2016/09/28 20:09:52 bluhm Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2016/11/01 13:43:27 tb Exp $
.include <bsd.own.mk>
.include <bsd.obj.mk>
diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile
index b3b7d12..bd21949 100644
--- a/regress/unittests/bitmap/Makefile
+++ b/regress/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/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index 43968c7..ae3c342 100644
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/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/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index e268daa..7ed3126 100644
--- a/regress/unittests/kex/Makefile
+++ b/regress/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/unittests/match/Makefile b/regress/unittests/match/Makefile
index 3197ece..bd4aed8 100644
--- a/regress/unittests/match/Makefile
+++ b/regress/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/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile
index 85f99ac..69b2756 100644
--- a/regress/unittests/sshbuf/Makefile
+++ b/regress/unittests/sshbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $
+# $OpenBSD: Makefile,v 1.5 2016/11/01 13:43:27 tb Exp $
PROG=test_sshbuf
SRCS=tests.c
diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index 8cfa3aa..cfbfcf8 100644
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/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/unittests/utf8/Makefile b/regress/unittests/utf8/Makefile
index 85cf7b8..a975264 100644
--- a/regress/unittests/utf8/Makefile
+++ b/regress/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