summaryrefslogtreecommitdiff
path: root/regress/unittests
diff options
context:
space:
mode:
authortb@openbsd.org <tb@openbsd.org>2016-11-01 13:43:27 +0000
committerDamien Miller <djm@mindrot.org>2016-11-29 17:16:29 +1100
commit7da751d8b007c7f3e814fd5737c2351440d78b4c (patch)
treea5c255a9ecf3185804cc3773d7ab20df207c6149 /regress/unittests
parent36f58e68221bced35e06d1cca8d97c48807a8b71 (diff)
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
Diffstat (limited to 'regress/unittests')
-rw-r--r--regress/unittests/Makefile.inc2
-rw-r--r--regress/unittests/bitmap/Makefile4
-rw-r--r--regress/unittests/hostkeys/Makefile4
-rw-r--r--regress/unittests/kex/Makefile4
-rw-r--r--regress/unittests/match/Makefile4
-rw-r--r--regress/unittests/sshbuf/Makefile2
-rw-r--r--regress/unittests/sshkey/Makefile4
-rw-r--r--regress/unittests/utf8/Makefile4
8 files changed, 8 insertions, 20 deletions
diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 20d32a7b..3d9eaba5 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 b3b7d12c..bd21949f 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 43968c70..ae3c342b 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 e268daad..7ed31267 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 3197ece9..bd4aed84 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 85f99ac3..69b27566 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 8cfa3aa5..cfbfcf8f 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 85cf7b81..a975264f 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