diff options
author | beck <> | 2020-09-21 15:13:24 +0000 |
---|---|---|
committer | beck <> | 2020-09-21 15:13:24 +0000 |
commit | 11de539d915a22f42d21f9ed4114d8edd9a3f93d (patch) | |
tree | a3c21e131c8eed8abf93309cb7dd44dea8364462 /src/regress/lib/libssl/interop/cert | |
parent | b4bc8d8b755aef4f7b08455fb0bbf31f536da85b (diff) | |
download | openbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.tar.gz openbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.tar.bz2 openbsd-11de539d915a22f42d21f9ed4114d8edd9a3f93d.zip |
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@
Diffstat (limited to 'src/regress/lib/libssl/interop/cert')
-rw-r--r-- | src/regress/lib/libssl/interop/cert/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.4 2019/02/21 23:06:33 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2020/09/21 15:13:24 beck 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.0.2, or openssl 1.1. Create client and server certificates | 4 | # openssl 1.0.2, or openssl 1.1. Create client and server certificates |
@@ -36,7 +36,11 @@ FAIL_${cca}_${sca}_${ccert}_${scert}_${cv}_${sv} = ! | |||
36 | .for clib in ${LIBRARIES} | 36 | .for clib in ${LIBRARIES} |
37 | .for slib in ${LIBRARIES} | 37 | .for slib in ${LIBRARIES} |
38 | 38 | ||
39 | .if ("${clib}" == "libressl" || "${slib}" == "libressl") | ||
39 | REGRESS_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} | 40 | REGRESS_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} |
41 | .else | ||
42 | REGRESS_SLOW_TARGETS += run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv} | ||
43 | .endif | ||
40 | 44 | ||
41 | run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ | 45 | run-cert-client-${clib}-${cca}-${ccert}-${cv}-server-${slib}-${sca}-${scert}-${sv}: \ |
42 | 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \ | 46 | 127.0.0.1.crt ca.crt fake-ca.crt client.crt server.crt \ |