From 36f58e68221bced35e06d1cca8d97c48807a8b71 Mon Sep 17 00:00:00 2001 From: "tb@openbsd.org" Date: Mon, 31 Oct 2016 23:45:08 +0000 Subject: upstream commit Remove the obsolete A and P flags from MALLOC_OPTIONS. ok dtucker Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59 --- regress/unittests/hostkeys/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regress/unittests/hostkeys/Makefile') diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile index f52a85fb1..43968c701 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 -- cgit v1.2.3 From 7da751d8b007c7f3e814fd5737c2351440d78b4c Mon Sep 17 00:00:00 2001 From: "tb@openbsd.org" Date: Tue, 1 Nov 2016 13:43:27 +0000 Subject: 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 --- regress/Makefile | 4 ++-- regress/connect-privsep.sh | 4 ++-- regress/unittests/Makefile.inc | 2 +- regress/unittests/bitmap/Makefile | 4 +--- regress/unittests/hostkeys/Makefile | 4 +--- regress/unittests/kex/Makefile | 4 +--- regress/unittests/match/Makefile | 4 +--- regress/unittests/sshbuf/Makefile | 2 +- regress/unittests/sshkey/Makefile | 4 +--- regress/unittests/utf8/Makefile | 4 +--- 10 files changed, 12 insertions(+), 24 deletions(-) (limited to 'regress/unittests/hostkeys/Makefile') diff --git a/regress/Makefile b/regress/Makefile index bc1555717..1f71761fa 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 @@ 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=FGJRX" +TEST_ENV= "MALLOC_OPTIONS=CFGJRSUX" TEST_SSH_SSHKEYGEN?=ssh-keygen diff --git a/regress/connect-privsep.sh b/regress/connect-privsep.sh index edfdbf0bf..81cedc7e5 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 @@ 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="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 20d32a7bf..3d9eaba5c 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 .include 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 @@ -# $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 43968c701..ae3c342bd 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 e268daad2..7ed312675 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 3197ece99..bd4aed844 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 85f99ac38..69b27566b 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 8cfa3aa54..cfbfcf8f1 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 85cf7b81f..a975264fc 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 -- cgit v1.2.3