From 0d7a4dd70e4bceb7c33867995a8047c0ef290093 Mon Sep 17 00:00:00 2001 From: anton Date: Mon, 22 Apr 2024 07:31:54 +0000 Subject: [PATCH] Instead of unhooking libssl/client regress tests, flag them as expected to fail. ok tb@ --- regress/lib/libssl/Makefile | 5 ++--- regress/lib/libssl/client/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/regress/lib/libssl/Makefile b/regress/lib/libssl/Makefile index c1a6018f980..d6dbc2f8eb7 100644 --- 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 c8a05690a0a..d0730569218 100644 --- 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 -- 2.20.1