upstream commit

Remove the obsolete A and P flags from MALLOC_OPTIONS.

ok dtucker

Upstream-Regress-ID: 6cc25024c8174a87e5734a0dc830194be216dd59

6 files changed, 12 insertions, 12 deletions

diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile
index b704d22d6..b3b7d12c7 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 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
diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index 6532cb00a..e268daad2 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 dc802f58d..3197ece99 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 1bcd26676..8cfa3aa54 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 150ea2f2e..85cf7b81f 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