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

3 files changed, 12 insertions, 6 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 @@
-# $OpenBSD: Makefile,v 1.1 2020/09/15 01:45:16 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2020/10/29 06:05:12 tb Exp $
 
 .if ! exists(/usr/local/bin/botan)
 regress:
         # install botan2 from ports for interop tests
         @echo SKIPPED
-.endif
+.else
 
 LIBRARIES =             libressl
 .if exists(/usr/local/bin/eopenssl)
@@ -67,4 +67,6 @@ server.crt: ca.crt ${@:R}.req
         /usr/local/bin/botan sign_cert ca.crt ca.key ${@:R}.req >$@.tmp
         mv $@.tmp $@
 
+.endif # exists(/usr/local/bin/botan)
+
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/interop/openssl/Makefile b/src/regress/lib/libssl/interop/openssl/Makefile
index adc93e5ad5..e56312505f 100644
--- a/src/regress/lib/libssl/interop/openssl/Makefile
+++ b/src/regress/lib/libssl/interop/openssl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2018/11/11 00:15:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.7 2020/10/29 06:05:12 tb Exp $
 
 .if ! exists(/usr/local/bin/eopenssl)
 regress:
         # install openssl-1.0.2 from ports for interop tests
         @echo SKIPPED
-.endif
+.else
 
 PROGS =                 client server
 CPPFLAGS =              -I /usr/local/include/eopenssl
@@ -40,4 +40,6 @@ run-protocol-$p: $p-self.out
 
 .endfor
 
+.endif # exists(/usr/local/bin/eopenssl)
+
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/interop/openssl11/Makefile b/src/regress/lib/libssl/interop/openssl11/Makefile
index 3ea1ef35da..678b1be255 100644
--- a/src/regress/lib/libssl/interop/openssl11/Makefile
+++ b/src/regress/lib/libssl/interop/openssl11/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2018/11/11 00:15:04 bluhm Exp $
+# $OpenBSD: Makefile,v 1.6 2020/10/29 06:05:12 tb Exp $
 
 .if ! exists(/usr/local/bin/eopenssl11)
 regress:
         # install openssl-1.1 from ports for interop tests
         @echo SKIPPED
-.endif
+.else
 
 PROGS =                 client server
 CPPFLAGS =              -I /usr/local/include/eopenssl11
@@ -40,4 +40,6 @@ run-protocol-$p: $p-self.out
 
 .endfor
 
+.endif # exists(/usr/local/bin/eopenssl11)
+
 .include <bsd.regress.mk>