From ddf62132f2cee1ea4db9d04ca8b307200e8d405d Mon Sep 17 00:00:00 2001 From: dtucker Date: Sun, 25 Jul 2021 12:27:37 +0000 Subject: [PATCH] Skip unit and makefile-based key conversion tests when we're building with OPENSSL=no. --- regress/usr.bin/ssh/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile index a896e097510..b69aad1d871 100644 --- a/regress/usr.bin/ssh/Makefile +++ b/regress/usr.bin/ssh/Makefile @@ -1,6 +1,9 @@ -# $OpenBSD: Makefile,v 1.114 2021/07/23 04:56:21 dtucker Exp $ +# $OpenBSD: Makefile,v 1.115 2021/07/25 12:27:37 dtucker Exp $ -.ifndef SKIP_UNIT +OPENSSL?= yes + +# Unit tests require OpenSSL. +.if !defined(SKIP_UNIT) && ${OPENSSL:L} == yes SUBDIR= unittests .endif SUBDIR+= misc @@ -8,7 +11,11 @@ SUBDIR+= misc REGRESS_SETUP_ONCE=misc # For sk-dummy.so REGRESS_FAIL_EARLY?= yes + +# Key conversion operations are not supported when built w/out OpenSSL. +.if ${OPENSSL:L} != no REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 +.endif LTESTS= connect \ proxy-connect \ -- 2.20.1