summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/interop/botan
diff options
context:
space:
mode:
authortb <>2020-10-29 06:05:12 +0000
committertb <>2020-10-29 06:05:12 +0000
commit1822c50c29255a6f1fb43434b5b68915ea021a20 (patch)
tree2b1c0a41f83390e53f9abaced6a05489fdab1744 /src/regress/lib/libssl/interop/botan
parent393560d6830a3c756a88e4275aaa6132e770aa55 (diff)
downloadopenbsd-1822c50c29255a6f1fb43434b5b68915ea021a20.tar.gz
openbsd-1822c50c29255a6f1fb43434b5b68915ea021a20.tar.bz2
openbsd-1822c50c29255a6f1fb43434b5b68915ea021a20.zip
Do not fail with obscure error messages on 'make'
Fix some tests that fail with obscure error messages on 'make' if the required package (either version of OpenSSL or Botan 2) isn't installed. This can be avoided by doing 'make regress' instead. I'll try to adjust my finger memory for the many tests outside the LibreSSL tree that have the same "problem". The fix here is unintrusive and I've been wasting enough time with this to want to change it. ok bluhm
Diffstat (limited to 'src/regress/lib/libssl/interop/botan')
-rw-r--r--src/regress/lib/libssl/interop/botan/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/interop/botan/Makefile b/src/regress/lib/libssl/interop/botan/Makefile
index f6a87dd6d7..cc8016cafb 100644
--- a/src/regress/lib/libssl/interop/botan/Makefile
+++ b/src/regress/lib/libssl/interop/botan/Makefile
@@ -1,10 +1,10 @@
1# $OpenBSD: Makefile,v 1.1 2020/09/15 01:45:16 bluhm Exp $ 1# $OpenBSD: Makefile,v 1.2 2020/10/29 06:05:12 tb Exp $
2 2
3.if ! exists(/usr/local/bin/botan) 3.if ! exists(/usr/local/bin/botan)
4regress: 4regress:
5 # install botan2 from ports for interop tests 5 # install botan2 from ports for interop tests
6 @echo SKIPPED 6 @echo SKIPPED
7.endif 7.else
8 8
9LIBRARIES = libressl 9LIBRARIES = libressl
10.if exists(/usr/local/bin/eopenssl) 10.if exists(/usr/local/bin/eopenssl)
@@ -67,4 +67,6 @@ server.crt: ca.crt ${@:R}.req
67 /usr/local/bin/botan sign_cert ca.crt ca.key ${@:R}.req >$@.tmp 67 /usr/local/bin/botan sign_cert ca.crt ca.key ${@:R}.req >$@.tmp
68 mv $@.tmp $@ 68 mv $@.tmp $@
69 69
70.endif # exists(/usr/local/bin/botan)
71
70.include <bsd.regress.mk> 72.include <bsd.regress.mk>