Instead of unhooking libssl/client regress tests, flag them as expected

to fail.

ok tb@

diff --git a/regress/lib/libssl/Makefile b/regress/lib/libssl/Makefile
index c1a6018..d6dbc2f 100644 (file)
--- a/regress/lib/libssl/Makefile
+++ b/regress/lib/libssl/Makefile
@@ -1,12 +1,11 @@
-#      $OpenBSD: Makefile,v 1.56 2024/03/26 01:18:16 beck Exp $
+#      $OpenBSD: Makefile,v 1.57 2024/04/22 07:31:54 anton Exp $
 
 SUBDIR += api
 SUBDIR += asn1
 SUBDIR += buffer
 SUBDIR += bytestring
 SUBDIR += ciphers
-#Disable for now for upcoming changes. This needs to be easier to deal with.
-#SUBDIR += client
+SUBDIR += client
 SUBDIR += dtls
 SUBDIR += exporter
 SUBDIR += handshake

diff --git a/regress/lib/libssl/client/Makefile b/regress/lib/libssl/client/Makefile
index c8a0569..d073056 100644 (file)
--- a/regress/lib/libssl/client/Makefile
+++ b/regress/lib/libssl/client/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.4 2023/04/23 18:59:41 tb Exp $
+#      $OpenBSD: Makefile,v 1.5 2024/04/22 07:31:54 anton Exp $
 
 PROG=  clienttest
 LDADD= ${SSL_INT} -lcrypto
@@ -6,4 +6,7 @@ DPADD=  ${LIBSSL} ${LIBCRYPTO}
 WARNINGS=      Yes
 CFLAGS+=       -DLIBRESSL_INTERNAL -Werror
 
+# Disable for now for upcoming changes. This needs to be easier to deal with.
+REGRESS_EXPECTED_FAILURES+=run-regress-clienttest
+
 .include <bsd.regress.mk>