On Mon, Nov 08, 2021 at 12:59:51AM +0100, Theo Buehler wrote:
> > rpki-client seems to be the one-off under regress/ in this regard.
>
> Maybe. I wish I had a better idea than this
There is: pull the test into the proper Makefile as done in
regress/sys/net/inetinet/pmtu/Makefile and not
regress/sys/net/inetinet/Makefile -- openssl11 is added last to SUBDIR,
`make obj' does only the symlink, `make' compiles and tries regress but
prints the SKIPPED iff eopenssl11 isn't there, all at the end.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/src/regress/usr.sbin/rpki-client/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 9 Nov 2020 15:49:48 -0000 1.10
> +++ Makefile 7 Nov 2021 23:59:10 -0000
> @@ -1,7 +1,8 @@
> # $OpenBSD: Makefile,v 1.10 2020/11/09 15:49:48 tb Exp $
>
> SUBDIR += libressl
> -.if exists(/usr/local/bin/eopenssl11)
> +.if exists(/usr/local/bin/eopenssl11) || \
> + make(obj) || make(clean) || make(cleandir)
> SUBDIR += openssl11
> .else
> .END:
>
OK?
Index: Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/rpki-client/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 9 Nov 2020 15:49:48 -0000 1.10
+++ Makefile 8 Nov 2021 22:42:43 -0000
@@ -1,13 +1,6 @@
# $OpenBSD: Makefile,v 1.10 2020/11/09 15:49:48 tb 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>
Index: openssl11/Makefile
===================================================================
RCS file: /cvs/src/regress/usr.sbin/rpki-client/openssl11/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- openssl11/Makefile 7 Oct 2021 10:34:39 -0000 1.4
+++ openssl11/Makefile 8 Nov 2021 22:42:42 -0000
@@ -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/
