Pull OpenSSL test into the Makefile using it to avoid it on "make obj"

This way a top-down "make obj" does nothing but symlink creation and "make"
or "make regress" still does the eopenssl11 check at the very end.

This is how the rest of the regress suite does it, e.g. sys/netinet/pmtu.

OK tb

diff --git a/regress/usr.sbin/rpki-client/Makefile b/regress/usr.sbin/rpki-client/Makefile
index ebbd0be..59b61c7 100644 (file)
--- a/regress/usr.sbin/rpki-client/Makefile
+++ b/regress/usr.sbin/rpki-client/Makefile
@@ -1,13 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2020/11/09 15:49:48 tb Exp $
+# $OpenBSD: Makefile,v 1.11 2021/11/08 23:06:49 kn Exp $
 
 SUBDIR += libressl
-.if exists(/usr/local/bin/eopenssl11)
 SUBDIR += openssl11
-.else
-.END:
-       @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1'
-       @echo SKIPPED
-.endif
 
 .include <bsd.subdir.mk>
-.include <bsd.regress.mk>

diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile
index a84809d..bc27a95 100644 (file)
--- a/regress/usr.sbin/rpki-client/openssl11/Makefile
+++ b/regress/usr.sbin/rpki-client/openssl11/Makefile
@@ -1,3 +1,9 @@
+.if ! exists(/usr/local/bin/eopenssl11)
+regress:
+       @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1'
+       @echo SKIPPED
+.endif
+
 LDADD +=       -Wl,-rpath,/usr/local/lib/eopenssl11 -L/usr/local/lib/eopenssl11
 CFLAGS +=      -I${.CURDIR}/ -I/usr/local/include/eopenssl11/