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@

5 files changed, 35 insertions, 9 deletions

diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index a6b93eed42..078f750842 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/regress/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.39 2020/05/21 10:46:29 tb Exp $
+#       $OpenBSD: Makefile,v 1.40 2020/09/21 15:13:24 beck Exp $
 
 SUBDIR += asn1
 SUBDIR += buffer
@@ -16,8 +16,8 @@ SUBDIR += key_schedule
 SUBDIR += unit
 
 # Things that take a long time should go below here. 
-SUBDIR += interop
 SUBDIR += tlsfuzzer
+SUBDIR += interop
 
 install:
 
diff --git a/src/regress/lib/libssl/interop/Makefile b/src/regress/lib/libssl/interop/Makefile
index 0bd1195d39..aa9c3adf56 100644
--- a/src/regress/lib/libssl/interop/Makefile
+++ b/src/regress/lib/libssl/interop/Makefile
@@ -1,13 +1,19 @@
-# $OpenBSD: Makefile,v 1.12 2020/09/15 01:45:16 bluhm Exp $
+# $OpenBSD: Makefile,v 1.13 2020/09/21 15:13:24 beck Exp $
 
 SUBDIR =        libressl openssl openssl11
 
 # the above binaries must have been built before we can continue
-SUBDIR +=       cert
-SUBDIR +=       cipher
-SUBDIR +=       version
 SUBDIR +=       netcat
 SUBDIR +=       session
 SUBDIR +=       botan
 
+# What is below takes a long time.
+# setting REGRESS_SKIP_SLOW to "yes" in mk.conf
+# will skip the tests that do not test libressl
+# but do things like test openssl to openssl11
+SUBDIR +=       version
+SUBDIR +=       cipher
+# This takes a really long time. 
+SUBDIR +=       cert
+
 .include <bsd.subdir.mk>
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 \
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile
index 4ad2dbe39b..fe74901d11 100644
--- a/src/regress/lib/libssl/interop/cipher/Makefile
+++ b/src/regress/lib/libssl/interop/cipher/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2020/09/12 15:48:30 bluhm Exp $
+# $OpenBSD: Makefile,v 1.6 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 lists of supported ciphers
@@ -103,7 +103,11 @@ DHPARAM_${cipher}_${slib} =	-p dh.param
 DHPARAM_${cipher}_${slib} =
 .endif
 
+.if ("${clib}" == "libressl" || "${slib}" == "libressl")
 REGRESS_TARGETS +=      run-cipher-${cipher}-client-${clib}-server-${slib}
+.else
+REGRESS_SLOW_TARGETS += run-cipher-${cipher}-client-${clib}-server-${slib}
+.endif
 run-cipher-${cipher}-client-${clib}-server-${slib} \
 client-cipher-${cipher}-client-${clib}-server-${slib}.out \
 server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
@@ -122,7 +126,11 @@ server-cipher-${cipher}-client-${clib}-server-${slib}.out: dh.param \
             { sleep 1; grep -q '^success$$' ${@:S/^run/server/}.out; }
         grep -q '^success$$' ${@:S/^run/client/}.out
 
+.if ("${clib}" == "libressl" || "${slib}" == "libressl")
 REGRESS_TARGETS +=      check-cipher-${cipher}-client-${clib}-server-${slib}
+.else
+REGRESS_SLOW_TARGETS += check-cipher-${cipher}-client-${clib}-server-${slib}
+.endif
 check-cipher-${cipher}-client-${clib}-server-${slib}: \
     client-cipher-${cipher}-client-${clib}-server-${slib}.out \
     server-cipher-${cipher}-client-${clib}-server-${slib}.out
diff --git a/src/regress/lib/libssl/interop/version/Makefile b/src/regress/lib/libssl/interop/version/Makefile
index 0f1d891f34..420b236421 100644
--- a/src/regress/lib/libssl/interop/version/Makefile
+++ b/src/regress/lib/libssl/interop/version/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2020/09/14 00:51:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 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.  Pin client or server to a fixed TLS
@@ -31,7 +31,11 @@ FAIL_${cver}_${sver} = !
 .if ("${clib}" != openssl && "${slib}" != openssl) || \
     ("${cver}" != TLS1_3 && "${sver}" != TLS1_3)
 
+.if ("${clib}" == "libressl" || "${slib}" == "libressl")
 REGRESS_TARGETS +=      run-version-client-${clib}-${cver}-server-${slib}-${sver}
+.else
+REGRESS_SLOW_TARGETS += run-version-client-${clib}-${cver}-server-${slib}-${sver}
+.endif
 
 run-version-client-${clib}-${cver}-server-${slib}-${sver} \
 client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \
@@ -56,7 +60,11 @@ server-version-client-${clib}-${cver}-server-${slib}-${sver}.out: \
 
 .if empty(${FAIL_${cver}_${sver}})
 
+.if ("${clib}" == "libressl" || "${slib}" == "libressl")
 REGRESS_TARGETS +=      check-version-client-${clib}-${cver}-server-${slib}-${sver}
+.else
+REGRESS_SLOW_TARGETS += check-version-client-${clib}-${cver}-server-${slib}-${sver}
+.endif
 
 check-version-client-${clib}-${cver}-server-${slib}-${sver}: \
     client-version-client-${clib}-${cver}-server-${slib}-${sver}.out \