summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranton <>2024-04-22 07:31:54 +0000
committeranton <>2024-04-22 07:31:54 +0000
commit288e8e1eee27aa566a3b51612169c4a2c6ab9ed5 (patch)
treeaeccced140fdebd5ce62096c923f5cfd4be0316a
parent3d90003980e50c9f9cccdf1937513dbe8bb82b0b (diff)
downloadopenbsd-288e8e1eee27aa566a3b51612169c4a2c6ab9ed5.tar.gz
openbsd-288e8e1eee27aa566a3b51612169c4a2c6ab9ed5.tar.bz2
openbsd-288e8e1eee27aa566a3b51612169c4a2c6ab9ed5.zip
Instead of unhooking libssl/client regress tests, flag them as expected
to fail. ok tb@
-rw-r--r--src/regress/lib/libssl/Makefile5
-rw-r--r--src/regress/lib/libssl/client/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index c1a6018f98..d6dbc2f8eb 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/regress/lib/libssl/Makefile
@@ -1,12 +1,11 @@
1# $OpenBSD: Makefile,v 1.56 2024/03/26 01:18:16 beck Exp $ 1# $OpenBSD: Makefile,v 1.57 2024/04/22 07:31:54 anton Exp $
2 2
3SUBDIR += api 3SUBDIR += api
4SUBDIR += asn1 4SUBDIR += asn1
5SUBDIR += buffer 5SUBDIR += buffer
6SUBDIR += bytestring 6SUBDIR += bytestring
7SUBDIR += ciphers 7SUBDIR += ciphers
8#Disable for now for upcoming changes. This needs to be easier to deal with. 8SUBDIR += client
9#SUBDIR += client
10SUBDIR += dtls 9SUBDIR += dtls
11SUBDIR += exporter 10SUBDIR += exporter
12SUBDIR += handshake 11SUBDIR += handshake
diff --git a/src/regress/lib/libssl/client/Makefile b/src/regress/lib/libssl/client/Makefile
index c8a05690a0..d073056921 100644
--- a/src/regress/lib/libssl/client/Makefile
+++ b/src/regress/lib/libssl/client/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.4 2023/04/23 18:59:41 tb Exp $ 1# $OpenBSD: Makefile,v 1.5 2024/04/22 07:31:54 anton Exp $
2 2
3PROG= clienttest 3PROG= clienttest
4LDADD= ${SSL_INT} -lcrypto 4LDADD= ${SSL_INT} -lcrypto
@@ -6,4 +6,7 @@ DPADD= ${LIBSSL} ${LIBCRYPTO}
6WARNINGS= Yes 6WARNINGS= Yes
7CFLAGS+= -DLIBRESSL_INTERNAL -Werror 7CFLAGS+= -DLIBRESSL_INTERNAL -Werror
8 8
9# Disable for now for upcoming changes. This needs to be easier to deal with.
10REGRESS_EXPECTED_FAILURES+=run-regress-clienttest
11
9.include <bsd.regress.mk> 12.include <bsd.regress.mk>