1 files changed, 14 insertions, 7 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 08fd82dbf..c2dba4fdf 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.88 2016/06/03 04:10:41 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.94 2016/12/16 03:51:19 dtucker Exp $
 
 REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
 tests:          prep $(REGRESS_TARGETS)
@@ -39,6 +39,7 @@ LTESTS= 	connect \
                 keyscan \
                 keygen-change \
                 keygen-convert \
+                keygen-moduli \
                 key-options \
                 scp \
                 sftp \
@@ -77,7 +78,8 @@ LTESTS= 	connect \
                 hostkey-rotate \
                 principals-command \
                 cert-file \
-                cfginclude
+                cfginclude \
+                allow-deny-users
 
 
 #               dhgex \
@@ -87,9 +89,10 @@ INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 
 #LTESTS=        cipher-speed
 
-USER!=          id -un
-CLEANFILES=     *.core actual agent-key.* authorized_keys_${USER} \
-                authorized_keys_${USER}.* authorized_principals_${USER} \
+USERNAME!=              id -un
+CLEANFILES=     *.core actual agent-key.* authorized_keys_${USERNAME} \
+                authorized_keys_${USERNAME}.* \
+                authorized_principals_${USERNAME} \
                 banner.in banner.out cert_host_key* cert_user_key* \
                 copy.1 copy.2 data ed25519-agent ed25519-agent* \
                 ed25519-agent.pub empty.in expect failed-regress.log \
@@ -111,10 +114,10 @@ CLEANFILES=	*.core actual agent-key.* authorized_keys_${USER} \
                 t6.out1 t6.out2 t7.out t7.out.pub t8.out t8.out.pub \
                 t9.out t9.out.pub testdata user_*key* user_ca* user_key*
 
-SUDO_CLEAN+=    /var/run/testdata_${USER} /var/run/keycommand_${USER}
+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=CFGJRSUX"
 
 TEST_SSH_SSHKEYGEN?=ssh-keygen
 
@@ -222,4 +225,8 @@ unit:
                 $$V ${.OBJDIR}/unittests/kex/test_kex ; \
                 $$V ${.OBJDIR}/unittests/hostkeys/test_hostkeys \
                         -d ${.CURDIR}/unittests/hostkeys/testdata ; \
+                $$V ${.OBJDIR}/unittests/match/test_match ; \
+                if test "x${TEST_SSH_UTF8}" = "xyes"  ; then \
+                        $$V ${.OBJDIR}/unittests/utf8/test_utf8 ; \
+                fi \
         fi