diff options
author | tb@openbsd.org <tb@openbsd.org> | 2016-10-31 23:45:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-11-29 17:14:27 +1100 |
commit | 36f58e68221bced35e06d1cca8d97c48807a8b71 (patch) | |
tree | 437fe5bb60924ef8c571be7c9f4778a723ca78cc | |
parent | b0899ee26a6630883c0f2350098b6a35e647f512 (diff) |
upstream commit
Remove the obsolete A and P flags from MALLOC_OPTIONS.
ok dtucker
Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59
-rw-r--r-- | regress/Makefile | 4 | ||||
-rw-r--r-- | regress/connect-privsep.sh | 4 | ||||
-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/sshkey/Makefile | 4 | ||||
-rw-r--r-- | regress/unittests/utf8/Makefile | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/regress/Makefile b/regress/Makefile index c7708ecc..bc155571 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.91 2016/10/06 09:31:38 natano Exp $ +# $OpenBSD: Makefile,v 1.92 2016/10/31 23:45:08 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 @@ 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=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" TEST_SSH_SSHKEYGEN?=ssh-keygen diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh index ea739f61..edfdbf0b 100644 --- a/regress/connect-privsep.sh +++ b/regress/connect-privsep.sh @@ -1,4 +1,4 @@ -# $OpenBSD: connect-privsep.sh,v 1.6 2015/03/03 22:35:19 markus Exp $ +# $OpenBSD: connect-privsep.sh,v 1.7 2016/10/31 23:45:08 tb Exp $ # Placed in the Public Domain. tid="proxy connect with privsep" @@ -27,7 +27,7 @@ done # 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="A F G H J P R S X < >" + mopts="F G H J R S X < >" else mopts=`echo $TEST_MALLOC_OPTIONS | sed 's/./& /g'` fi diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile index b704d22d..b3b7d12c 100644 --- a/regress/unittests/bitmap/Makefile +++ b/regress/unittests/bitmap/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2015/01/15 07:36:28 djm Exp $ +# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" PROG=test_bitmap SRCS=tests.c diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile index f52a85fb..43968c70 100644 --- a/regress/unittests/hostkeys/Makefile +++ b/regress/unittests/hostkeys/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2015/02/16 22:18:34 djm Exp $ +# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:08 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" PROG=test_hostkeys SRCS=tests.c test_iterate.c diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile index 6532cb00..e268daad 100644 --- a/regress/unittests/kex/Makefile +++ b/regress/unittests/kex/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2015/01/24 10:39:21 miod Exp $ +# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" PROG=test_kex SRCS=tests.c test_kex.c diff --git a/regress/unittests/match/Makefile b/regress/unittests/match/Makefile index dc802f58..3197ece9 100644 --- a/regress/unittests/match/Makefile +++ b/regress/unittests/match/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2016/08/19 06:44:13 djm Exp $ +# $OpenBSD: Makefile,v 1.2 2016/10/31 23:45:09 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" PROG=test_match SRCS=tests.c diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile index 1bcd2667..8cfa3aa5 100644 --- a/regress/unittests/sshkey/Makefile +++ b/regress/unittests/sshkey/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/06/24 01:14:18 djm Exp $ +# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" +TEST_ENV= "MALLOC_OPTIONS=FGJRX" 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 150ea2f2..85cf7b81 100644 --- a/regress/unittests/utf8/Makefile +++ b/regress/unittests/utf8/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2016/05/30 12:14:08 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2016/10/31 23:45:09 tb Exp $ -TEST_ENV= "MALLOC_OPTIONS=CFGJPRSUX" +TEST_ENV= "MALLOC_OPTIONS=CFGJRSUX" PROG=test_utf8 SRCS=tests.c |