Do not skip any crypto tests. Remove useless make code, use defaults

where appropriate.
OK mikeb@

diff --git a/regress/sys/crypto/Makefile b/regress/sys/crypto/Makefile
index fc204bb..cf61fa1 100644 (file)
--- a/regress/sys/crypto/Makefile
+++ b/regress/sys/crypto/Makefile
@@ -1,17 +1,14 @@
-#      $OpenBSD: Makefile,v 1.11 2015/11/04 12:24:31 mikeb Exp $
+#      $OpenBSD: Makefile,v 1.12 2017/06/22 18:07:30 bluhm Exp $
 
 SUBDIR+= cmac
 SUBDIR+= gmac
 SUBDIR+= hmac
 SUBDIR+= key_wrap
-
-.if defined(REGRESS_FULL) || make(clean) || make(cleandir) || make(obj)
 SUBDIR+= enc
 SUBDIR+= aesctr
 SUBDIR+= aesxts
 SUBDIR+= aes
 SUBDIR+= chachapoly
-.endif
 
 install:
 

diff --git a/regress/sys/crypto/aes/Makefile b/regress/sys/crypto/aes/Makefile
index ca95a96..0154900 100644 (file)
--- a/regress/sys/crypto/aes/Makefile
+++ b/regress/sys/crypto/aes/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.4 2017/05/02 11:33:48 mikeb Exp $
+#       $OpenBSD: Makefile,v 1.5 2017/06/22 18:07:30 bluhm Exp $
 
 DIR=   ${.CURDIR}/../../../../sys
 
@@ -16,8 +16,6 @@ CDIAGFLAGS+=  -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 CDIAGFLAGS+=   -Wshadow
 
-REGRESS_ROOT_TARGETS=  run-regress-${PROG}
-
 .PATH: ${DIR}/crypto
 SRCS+= aes.c
 

diff --git a/regress/sys/crypto/aesctr/Makefile b/regress/sys/crypto/aesctr/Makefile
index 59b5ade..7579b3b 100644 (file)
--- a/regress/sys/crypto/aesctr/Makefile
+++ b/regress/sys/crypto/aesctr/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.5 2017/06/22 17:48:42 mikeb Exp $
+#       $OpenBSD: Makefile,v 1.6 2017/06/22 18:07:30 bluhm Exp $
 
 DIR=   ${.CURDIR}/../../../../sys
 
@@ -17,14 +17,9 @@ CDIAGFLAGS+= -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 CDIAGFLAGS+=   -Wshadow
 
-REGRESS_ROOT_TARGETS=  run-regress-${PROG}
-
 .PATH: ${DIR}/crypto
 SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c aes.c rijndael.c set_key.c
 SRCS+= chachapoly.c poly1305.c
 SRCS+= xform.c
 
-run-regress-${PROG}: ${PROG}
-       ./${PROG}
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/crypto/aesxts/Makefile b/regress/sys/crypto/aesxts/Makefile
index ddb6e9e..b47ed8c 100644 (file)
--- a/regress/sys/crypto/aesxts/Makefile
+++ b/regress/sys/crypto/aesxts/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.6 2017/05/17 17:54:29 mikeb Exp $
+#       $OpenBSD: Makefile,v 1.7 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=   ${.CURDIR}/../../../../sys
 
@@ -17,14 +17,9 @@ CDIAGFLAGS+= -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 CDIAGFLAGS+=   -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 .PATH:  ${DIR}/crypto
 SRCS+= cast.c ecb_enc.c ecb3_enc.c gmac.c aes.c set_key.c
 SRCS+= rijndael.c chachapoly.c poly1305.c
 SRCS+= xform.c
 
-run-regress-${PROG}: ${PROG}
-       ./${PROG}
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/crypto/chachapoly/Makefile b/regress/sys/crypto/chachapoly/Makefile
index b9b52d9..cab636a 100644 (file)
--- a/regress/sys/crypto/chachapoly/Makefile
+++ b/regress/sys/crypto/chachapoly/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 2015/11/03 01:46:08 mikeb Exp $
+#      $OpenBSD: Makefile,v 1.2 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
@@ -14,13 +14,8 @@ CDIAGFLAGS+= -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 #CDIAGFLAGS+=  -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 CFLAGS+=       -I${DIR}
 
 .PATH: ${DIR}/crypto
 
-run-regress-${PROG}: ${PROG}
-       ./${PROG}
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/crypto/cmac/Makefile b/regress/sys/crypto/cmac/Makefile
index 8a1267a..2bdcba6 100644 (file)
--- a/regress/sys/crypto/cmac/Makefile
+++ b/regress/sys/crypto/cmac/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.4 2017/05/02 17:08:30 mikeb Exp $
+#      $OpenBSD: Makefile,v 1.5 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
@@ -14,8 +14,6 @@ CDIAGFLAGS+=  -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 #CDIAGFLAGS+=  -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 CFLAGS+=       -I${DIR}
 
 .PATH: ${DIR}/crypto/

diff --git a/regress/sys/crypto/enc/Makefile b/regress/sys/crypto/enc/Makefile
index e1575ed..99a2658 100644 (file)
--- a/regress/sys/crypto/enc/Makefile
+++ b/regress/sys/crypto/enc/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.9 2017/06/22 17:48:42 mikeb Exp $
+#       $OpenBSD: Makefile,v 1.10 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=   ${.CURDIR}/../../../../sys
 
@@ -9,14 +9,9 @@ SRCS=  des3.c
 LDADD=-lcrypto
 DPADD=${LIBCRYPTO}
 
-REGRESS_ROOT_TARGETS=  run-regress-${PROG}
-
 .PATH: ${DIR}/crypto
 SRCS+= aes.c cast.c ecb_enc.c ecb3_enc.c gmac.c rijndael.c set_key.c
 SRCS+= chachapoly.c poly1305.c
 SRCS+= xform.c
 
-run-regress-${PROG}: ${PROG}
-       ./${PROG}
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/crypto/gmac/Makefile b/regress/sys/crypto/gmac/Makefile
index 35f6776..371df17 100644 (file)
--- a/regress/sys/crypto/gmac/Makefile
+++ b/regress/sys/crypto/gmac/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2017/05/02 11:46:00 mikeb Exp $
+#      $OpenBSD: Makefile,v 1.4 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
@@ -14,13 +14,8 @@ CDIAGFLAGS+= -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 #CDIAGFLAGS+=  -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 CFLAGS+=       -I${DIR}
 
 .PATH: ${DIR}/crypto
 
-run-regress-${PROG}: ${PROG}
-       ./${PROG}
-
 .include <bsd.regress.mk>

diff --git a/regress/sys/crypto/hmac/Makefile b/regress/sys/crypto/hmac/Makefile
index 64d0561..d993d4d 100644 (file)
--- a/regress/sys/crypto/hmac/Makefile
+++ b/regress/sys/crypto/hmac/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2014/01/18 05:54:52 martynas Exp $
+#      $OpenBSD: Makefile,v 1.4 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
@@ -14,8 +14,6 @@ CDIAGFLAGS+=  -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 #CDIAGFLAGS+=  -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 CFLAGS+=       -I${DIR}
 
 .PATH: ${DIR}/crypto/

diff --git a/regress/sys/crypto/key_wrap/Makefile b/regress/sys/crypto/key_wrap/Makefile
index cd4f759..0a41513 100644 (file)
--- a/regress/sys/crypto/key_wrap/Makefile
+++ b/regress/sys/crypto/key_wrap/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2017/05/02 17:08:30 mikeb Exp $
+#      $OpenBSD: Makefile,v 1.6 2017/06/22 18:07:31 bluhm Exp $
 
 DIR=${.CURDIR}/../../../../sys
 
@@ -14,8 +14,6 @@ CDIAGFLAGS+=  -Wunused
 CDIAGFLAGS+=   -Wsign-compare
 #CDIAGFLAGS+=  -Wshadow
 
-REGRESS_TARGETS=       run-regress-${PROG}
-
 CFLAGS+=       -I${DIR}
 
 .PATH: ${DIR}/crypto/ ${DIR}/lib/libkern/