summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libssl/interop/cert/Makefile11
-rw-r--r--src/regress/lib/libssl/interop/cipher/Makefile14
-rw-r--r--src/regress/lib/libssl/interop/version/Makefile14
3 files changed, 31 insertions, 8 deletions
diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile
index 32b7a4f4f1..47f4422d6e 100644
--- a/src/regress/lib/libssl/interop/cert/Makefile
+++ b/src/regress/lib/libssl/interop/cert/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.9 2023/02/01 14:39:09 tb Exp $ 1# $OpenBSD: Makefile,v 1.10 2023/04/19 15:34:23 tb Exp $
2 2
3# Connect a client to a server. Both can be current libressl, or 3# Connect a client to a server. Both can be current libressl, or
4# openssl 1.1 or 3.0. Create client and server certificates 4# openssl 1.1 or 3.0. Create client and server certificates
@@ -39,7 +39,8 @@ FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv} = !
39.if ("${clib}" == "libressl" || "${slib}" == "libressl") 39.if ("${clib}" == "libressl" || "${slib}" == "libressl")
40REGRESS_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} 40REGRESS_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}
41.else 41.else
42REGRESS_SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} 42# Don't use REGRESS_SLOW_TARGETS since its handling in bsd.regress.mk is slow.
43SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}
43.endif 44.endif
44 45
45run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ 46run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \
@@ -76,6 +77,12 @@ run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${s
76.endfor 77.endfor
77.endfor 78.endfor
78 79
80.include <bsd.own.mk>
81REGRESS_SKIP_SLOW ?= no
82.if ${REGRESS_SKIP_SLOW:L} != "yes"
83REGRESS_TARGETS += ${SLOW_TARGETS}
84.endif
85
79REGRESS_TARGETS += run-bob 86REGRESS_TARGETS += run-bob
80run-bob: 87run-bob:
81 @echo Bob, be happy! Tests finished. 88 @echo Bob, be happy! Tests finished.
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index 3cb4330d31..85d927a92d 100644
--- a/src/regress/lib/libssl/interop/cipher/Makefile
+++ b/src/regress/lib/libssl/interop/cipher/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.11 2023/02/01 14:39:09 tb Exp $ 1# $OpenBSD: Makefile,v 1.12 2023/04/19 15:34:23 tb Exp $
2 2
3# Connect a client to a server. Both can be current libressl, or 3# Connect a client to a server. Both can be current libressl, or
4# openssl 1.1 or 3.0. Create lists of supported ciphers 4# openssl 1.1 or 3.0. Create lists of supported ciphers
@@ -105,7 +105,8 @@ DHPARAM_${cipher}_${slib} =
105.if ("${clib}" == "libressl" || "${slib}" == "libressl") 105.if ("${clib}" == "libressl" || "${slib}" == "libressl")
106REGRESS_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib} 106REGRESS_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib}
107.else 107.else
108REGRESS_SLOW_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib} 108# Don't use REGRESS_SLOW_TARGETS since its handling in bsd.regress.mk is slow.
109SLOW_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib}
109.endif 110.endif
110run-cipher-${cipher}-client-${clib}-server-${slib} \ 111run-cipher-${cipher}-client-${clib}-server-${slib} \
111client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 112client-cipher-${cipher}-client-${clib}-server-${slib}.out \
@@ -127,7 +128,8 @@ server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
127.if ("${clib}" == "libressl" || "${slib}" == "libressl") 128.if ("${clib}" == "libressl" || "${slib}" == "libressl")
128REGRESS_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib} 129REGRESS_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
129.else 130.else
130REGRESS_SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib} 131# Don't use REGRESS_SLOW_TARGETS since its handling in bsd.regress.mk is slow.
132SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
131.endif 133.endif
132check-cipher-${cipher}-client-${clib}-server-${slib}: \ 134check-cipher-${cipher}-client-${clib}-server-${slib}: \
133 client-cipher-${cipher}-client-${clib}-server-${slib}.out \ 135 client-cipher-${cipher}-client-${clib}-server-${slib}.out \
@@ -161,4 +163,10 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \
161.endfor 163.endfor
162.endfor 164.endfor
163 165
166.include <bsd.own.mk>
167REGRESS_SKIP_SLOW ?= no
168.if ${REGRESS_SKIP_SLOW:L} != "yes"
169REGRESS_TARGETS += ${SLOW_TARGETS}
170.endif
171
164.include <bsd.regress.mk> 172.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile
index 1e0af57a66..9d0ae418ba 100644
--- a/src/regress/lib/libssl/interop/version/Makefile
+++ b/src/regress/lib/libssl/interop/version/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.5 2023/02/01 14:39:09 tb Exp $ 1# $OpenBSD: Makefile,v 1.6 2023/04/19 15:34:23 tb Exp $
2 2
3# Connect a client to a server. Both can be current libressl, or 3# Connect a client to a server. Both can be current libressl, or
4# openssl 1.1 or openssl 3.0. Pin client or server to a fixed TLS 4# openssl 1.1 or openssl 3.0. Pin client or server to a fixed TLS
@@ -37,7 +37,8 @@ FAIL_${cver}_${sver} = !
37.if ("${clib}" == "libressl" || "${slib}" == "libressl") 37.if ("${clib}" == "libressl" || "${slib}" == "libressl")
38REGRESS_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver} 38REGRESS_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver}
39.else 39.else
40REGRESS_SLOW_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver} 40# Don't use REGRESS_SLOW_TARGETS since its handling in bsd.regress.mk is slow.
41SLOW_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver}
41.endif 42.endif
42 43
43run-version-client-${clib}-${cver}-server-${slib}-${sver} \ 44run-version-client-${clib}-${cver}-server-${slib}-${sver} \
@@ -65,7 +66,8 @@ server-version-client-${clib}-${cver}-server-${slib}-${sver}.out: \
65.if ("${clib}" == "libressl" || "${slib}" == "libressl") 66.if ("${clib}" == "libressl" || "${slib}" == "libressl")
66REGRESS_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sver} 67REGRESS_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sver}
67.else 68.else
68REGRESS_SLOW_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sver} 69# Don't use REGRESS_SLOW_TARGETS since its handling in bsd.regress.mk is slow.
70SLOW_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sver}
69.endif 71.endif
70 72
71check-version-client-${clib}-${cver}-server-${slib}-${sver}: \ 73check-version-client-${clib}-${cver}-server-${slib}-${sver}: \
@@ -98,4 +100,10 @@ check-version-client-${clib}-${cver}-server-${slib}-${sver}: \
98.endfor 100.endfor
99.endfor 101.endfor
100 102
103.include <bsd.own.mk>
104REGRESS_SKIP_SLOW ?= no
105.if ${REGRESS_SKIP_SLOW:L} != "yes"
106REGRESS_TARGETS += ${SLOW_TARGETS}
107.endif
108
101.include <bsd.regress.mk> 109.include <bsd.regress.mk>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 04:11:21 +0000