summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2018-08-31 17:35:21 +0000
committertb <>2018-08-31 17:35:21 +0000
commitacc1581448c8aafe2e75f0ad04bf4fd54accfdac (patch)
tree616ad7488b118a42b291e29a3113939fcc4c6894
parent7fd72ef772f40701c2b750a94bdb773329563cc9 (diff)
downloadopenbsd-acc1581448c8aafe2e75f0ad04bf4fd54accfdac.tar.gz
openbsd-acc1581448c8aafe2e75f0ad04bf4fd54accfdac.tar.bz2
openbsd-acc1581448c8aafe2e75f0ad04bf4fd54accfdac.zip
Instead of enumerating the files to clean by hand, set PROGS=${TESTS}.
Suggested by jsing
-rw-r--r--src/regress/lib/libcrypto/asn1/Makefile6
-rw-r--r--src/regress/lib/libcrypto/free/Makefile6
2 files changed, 7 insertions, 5 deletions
diff --git a/src/regress/lib/libcrypto/asn1/Makefile b/src/regress/lib/libcrypto/asn1/Makefile
index 3128179e90..2dae70e9e5 100644
--- a/src/regress/lib/libcrypto/asn1/Makefile
+++ b/src/regress/lib/libcrypto/asn1/Makefile
@@ -1,10 +1,12 @@
1# $OpenBSD: Makefile,v 1.4 2018/08/30 18:36:59 tb Exp $ 1# $OpenBSD: Makefile,v 1.5 2018/08/31 17:35:21 tb Exp $
2 2
3TESTS = \ 3TESTS = \
4 asn1evp \ 4 asn1evp \
5 asn1time \ 5 asn1time \
6 rfc5280time 6 rfc5280time
7 7
8PROGS = ${TESTS}
9
8REGRESS_TARGETS= all_tests 10REGRESS_TARGETS= all_tests
9 11
10LDADD= -lcrypto 12LDADD= -lcrypto
@@ -13,8 +15,6 @@ WARNINGS= Yes
13LDFLAGS+= -lcrypto 15LDFLAGS+= -lcrypto
14CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror 16CFLAGS+= -DLIBRESSL_INTERNAL -Wall -Wundef -Werror
15 17
16CLEANFILES+= ${TESTS} ${TESTS:S/$/.d/}
17
18all_tests: ${TESTS} 18all_tests: ${TESTS}
19 @for test in $>; do \ 19 @for test in $>; do \
20 ./$$test; \ 20 ./$$test; \
diff --git a/src/regress/lib/libcrypto/free/Makefile b/src/regress/lib/libcrypto/free/Makefile
index dabc06262e..4e8a7ed38d 100644
--- a/src/regress/lib/libcrypto/free/Makefile
+++ b/src/regress/lib/libcrypto/free/Makefile
@@ -1,8 +1,10 @@
1# $OpenBSD: Makefile,v 1.2 2018/07/10 20:53:30 tb Exp $ 1# $OpenBSD: Makefile,v 1.3 2018/08/31 17:35:21 tb Exp $
2 2
3TESTS = \ 3TESTS = \
4 freenull 4 freenull
5 5
6PROG = ${TESTS}
7
6REGRESS_TARGETS= all_tests 8REGRESS_TARGETS= all_tests
7 9
8LDADD= -lcrypto 10LDADD= -lcrypto
@@ -10,7 +12,7 @@ DPADD= ${LIBCRYPTO} ${LIBSSL}
10LDFLAGS+= -lcrypto 12LDFLAGS+= -lcrypto
11CFLAGS+= -DLIBRESSL_INTERNAL 13CFLAGS+= -DLIBRESSL_INTERNAL
12 14
13CLEANFILES+= ${TESTS} ${TESTS}.d freenull.c freenull.c.body freenull.c.tmp 15CLEANFILES+= freenull.c freenull.c.body freenull.c.tmp
14 16
15freenull.c: freenull.awk ../../../../lib/libcrypto/Symbols.list 17freenull.c: freenull.awk ../../../../lib/libcrypto/Symbols.list
16 awk -f ${.CURDIR}/freenull.awk \ 18 awk -f ${.CURDIR}/freenull.awk \