From 9d558960cf920187dcf488f05a3decde546bbddc Mon Sep 17 00:00:00 2001 From: beck <> Date: Mon, 21 Sep 2020 15:13:24 +0000 Subject: 1) Move the interop tests to the end so we see tlsfuzzer first 2) Reorder the interop tests so the really slow "cert" test is at the end 3) Change the cert tests to use REGRESS_SLOW_TARGETS when testing combination of client and server that does not involve libressl. This way we can skip testing openssl to openssl11 when running these manually by setting REGRESS_SKIP_SLOW to "yet" in mk.conf ok jsing@ --- src/regress/lib/libssl/interop/cert/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/regress/lib/libssl/interop/cert') diff --git a/src/regress/lib/libssl/interop/cert/Makefile b/src/regress/lib/libssl/interop/cert/Makefile index 11bc4aa2ab..a2838499e8 100644 --- a/src/regress/lib/libssl/interop/cert/Makefile +++ b/src/regress/lib/libssl/interop/cert/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/02/21 23:06:33 bluhm Exp $ +# $OpenBSD: Makefile,v 1.5 2020/09/21 15:13:24 beck Exp $ # Connect a client to a server. Both can be current libressl, or # openssl 1.0.2, or openssl 1.1. Create client and server certificates @@ -36,7 +36,11 @@ FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv} = ! .for clib in ${LIBRARIES} .for slib in ${LIBRARIES} +.if ("${clib}" == "libressl" || "${slib}" == "libressl") REGRESS_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} +.else +REGRESS_SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} +.endif run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \ -- cgit v1.2.3-55-g6feb