diff options
author | tb@openbsd.org <tb@openbsd.org> | 2016-11-01 13:43:27 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-11-29 17:16:29 +1100 |
commit | 7da751d8b007c7f3e814fd5737c2351440d78b4c (patch) | |
tree | a5c255a9ecf3185804cc3773d7ab20df207c6149 /regress/unittests | |
parent | 36f58e68221bced35e06d1cca8d97c48807a8b71 (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.inc | 2 | ||||
-rw-r--r-- | regress/unittests/bitmap/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/hostkeys/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/kex/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/match/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/sshbuf/Makefile | 2 | ||||
-rw-r--r-- | regress/unittests/sshkey/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/utf8/Makefile | 4 |
8 files changed, 8 insertions, 20 deletions
diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc index 20d32a7bf..3d9eaba5c 100644 --- a/regress/unittests/Makefile.inc +++ b/regress/unittests/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.7 2016/09/28 20:09:52 bluhm Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.9 2016/11/01 13:43:27 tb Exp $ |
2 | 2 | ||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
4 | .include <bsd.obj.mk> | 4 | .include <bsd.obj.mk> |
diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile index b3b7d12c7..bd21949f8 100644 --- a/regress/unittests/bitmap/Makefile +++ b/regress/unittests/bitmap/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=FGJRX" | ||
4 | 2 | ||
5 | PROG=test_bitmap | 3 | PROG=test_bitmap |
6 | SRCS=tests.c | 4 | SRCS=tests.c |
diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile index 43968c701..ae3c342bd 100644 --- a/regress/unittests/hostkeys/Makefile +++ b/regress/unittests/hostkeys/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=FGJRX" | ||
4 | 2 | ||
5 | PROG=test_hostkeys | 3 | PROG=test_hostkeys |
6 | SRCS=tests.c test_iterate.c | 4 | SRCS=tests.c test_iterate.c |
diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile index e268daad2..7ed312675 100644 --- a/regress/unittests/kex/Makefile +++ b/regress/unittests/kex/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=FGJRX" | ||
4 | 2 | ||
5 | PROG=test_kex | 3 | PROG=test_kex |
6 | SRCS=tests.c test_kex.c | 4 | SRCS=tests.c test_kex.c |
diff --git a/regress/unittests/match/Makefile b/regress/unittests/match/Makefile index 3197ece99..bd4aed844 100644 --- a/regress/unittests/match/Makefile +++ b/regress/unittests/match/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:09 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.3 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=FGJRX" | ||
4 | 2 | ||
5 | PROG=test_match | 3 | PROG=test_match |
6 | SRCS=tests.c | 4 | SRCS=tests.c |
diff --git a/regress/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile index 85f99ac38..69b27566b 100644 --- a/regress/unittests/sshbuf/Makefile +++ b/regress/unittests/sshbuf/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2016/11/01 13:43:27 tb Exp $ |
2 | 2 | ||
3 | PROG=test_sshbuf | 3 | PROG=test_sshbuf |
4 | SRCS=tests.c | 4 | SRCS=tests.c |
diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile index 8cfa3aa54..cfbfcf8f1 100644 --- a/regress/unittests/sshkey/Makefile +++ b/regress/unittests/sshkey/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=FGJRX" | ||
4 | 2 | ||
5 | PROG=test_sshkey | 3 | PROG=test_sshkey |
6 | SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c | 4 | 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 85cf7b81f..a975264fc 100644 --- a/regress/unittests/utf8/Makefile +++ b/regress/unittests/utf8/Makefile | |||
@@ -1,6 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.4 2016/11/01 13:43:27 tb Exp $ |
2 | |||
3 | TEST_ENV= "MALLOC_OPTIONS=CFGJRSUX" | ||
4 | 2 | ||
5 | PROG=test_utf8 | 3 | PROG=test_utf8 |
6 | SRCS=tests.c | 4 | SRCS=tests.c |