From 5bab9c6ba3989c63ecdf8e39c0f2a58f511b2ff9 Mon Sep 17 00:00:00 2001 From: bluhm Date: Thu, 22 Jun 2017 18:07:30 +0000 Subject: [PATCH] Do not skip any crypto tests. Remove useless make code, use defaults where appropriate. OK mikeb@ --- regress/sys/crypto/Makefile | 5 +---- regress/sys/crypto/aes/Makefile | 4 +--- regress/sys/crypto/aesctr/Makefile | 7 +------ regress/sys/crypto/aesxts/Makefile | 7 +------ regress/sys/crypto/chachapoly/Makefile | 7 +------ regress/sys/crypto/cmac/Makefile | 4 +--- regress/sys/crypto/enc/Makefile | 7 +------ regress/sys/crypto/gmac/Makefile | 7 +------ regress/sys/crypto/hmac/Makefile | 4 +--- regress/sys/crypto/key_wrap/Makefile | 4 +--- 10 files changed, 10 insertions(+), 46 deletions(-) diff --git a/regress/sys/crypto/Makefile b/regress/sys/crypto/Makefile index fc204bbd393..cf61fa1638e 100644 --- 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 ca95a9617f9..0154900ff79 100644 --- 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 59b5ade1fb1..7579b3ba4ba 100644 --- 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 diff --git a/regress/sys/crypto/aesxts/Makefile b/regress/sys/crypto/aesxts/Makefile index ddb6e9edfef..b47ed8c2f51 100644 --- 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 diff --git a/regress/sys/crypto/chachapoly/Makefile b/regress/sys/crypto/chachapoly/Makefile index b9b52d922ba..cab636aed41 100644 --- 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 diff --git a/regress/sys/crypto/cmac/Makefile b/regress/sys/crypto/cmac/Makefile index 8a1267a57e0..2bdcba68102 100644 --- 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 e1575edb56b..99a26580652 100644 --- 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 diff --git a/regress/sys/crypto/gmac/Makefile b/regress/sys/crypto/gmac/Makefile index 35f6776304a..371df17d3b9 100644 --- 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 diff --git a/regress/sys/crypto/hmac/Makefile b/regress/sys/crypto/hmac/Makefile index 64d0561d457..d993d4d276a 100644 --- 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 cd4f759e0a2..0a41513b280 100644 --- 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/ -- 2.20.1