From: kn <kn@openbsd.org>
Date: Thu, 2 Dec 2021 17:10:53 +0000 (+0000)
Subject: Tell testers which packages to install right away (and why)
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dbfd11f7a56ae40ef6ed323fce04791a59389c86;p=openbsd

Tell testers which packages to install right away (and why)

Other regress tests do it differently;  just fix/thouch those that did not
mention any package name at all.

This helps grepping logs for SKIPPED to find instructions for the next run.
---

diff --git a/regress/lib/libssl/interop/botan/Makefile b/regress/lib/libssl/interop/botan/Makefile
index a162ee9e173..ea9517dc6db 100644
--- a/regress/lib/libssl/interop/botan/Makefile
+++ b/regress/lib/libssl/interop/botan/Makefile
@@ -1,14 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.5 2021/12/02 17:10:53 kn Exp $
 
 .include <bsd.own.mk>
 
 .if ! exists(/usr/local/bin/botan)
 regress:
 	# install botan2 from ports for interop tests
+	@echo 'Run "pkg_add botan2" to run tests against Botan 2'
 	@echo SKIPPED
 .elif (${COMPILER_VERSION:L} != "clang" && ! exists(/usr/local/bin/eg++))
 regress:
 	# on gcc-archs install g++ from ports for botan2 interop tests
+	@echo 'Run "pkg_add g++" to run tests against Botan 2 on GCC architectures'
 	@echo SKIPPED
 .else
 
diff --git a/regress/lib/libssl/interop/openssl/Makefile b/regress/lib/libssl/interop/openssl/Makefile
index 181d35aa028..53c51a83eef 100644
--- a/regress/lib/libssl/interop/openssl/Makefile
+++ b/regress/lib/libssl/interop/openssl/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.9 2021/12/02 17:10:53 kn Exp $
 
 .if ! exists(/usr/local/bin/eopenssl)
 regress:
 	# install openssl-1.0.2 from ports for interop tests
+	@echo 'Run "pkg_add openssl--%1.0.2" to run tests against OpenSSL 1.0.2'
 	@echo SKIPPED
 .else
 
diff --git a/regress/lib/libssl/interop/openssl11/Makefile b/regress/lib/libssl/interop/openssl11/Makefile
index 32fd611ae4f..27e73549255 100644
--- a/regress/lib/libssl/interop/openssl11/Makefile
+++ b/regress/lib/libssl/interop/openssl11/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.8 2021/12/02 17:10:53 kn Exp $
 
 .if ! exists(/usr/local/bin/eopenssl11)
 regress:
 	# install openssl-1.1 from ports for interop tests
+	@echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1'
 	@echo SKIPPED
 .else
 
diff --git a/regress/usr.sbin/httpd/tests/Makefile b/regress/usr.sbin/httpd/tests/Makefile
index e3b977a4441..c23e6b894dd 100644
--- a/regress/usr.sbin/httpd/tests/Makefile
+++ b/regress/usr.sbin/httpd/tests/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2021/10/05 17:40:08 anton Exp $
+#	$OpenBSD: Makefile,v 1.15 2021/12/02 17:10:53 kn Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-IO-Socket-INET6	object interface for AF_INET and AF_INET6 domain sockets
@@ -16,7 +16,7 @@ PERL_REQUIRE !=	perl -Mstrict -Mwarnings -e ' \
 .if ! empty (PERL_REQUIRE)
 regress:
 	@echo "${PERL_REQUIRE}"
-	@echo install these perl packages for additional tests
+	@echo 'run "pkg_add p5-IO-Socket-INET6 p5-Socket6 p5-IO-Socket-SSL"'
 	@echo SKIPPED
 .endif
 
diff --git a/regress/usr.sbin/ospfd/Makefile b/regress/usr.sbin/ospfd/Makefile
index e327ec4a7fd..a4d90574e28 100644
--- a/regress/usr.sbin/ospfd/Makefile
+++ b/regress/usr.sbin/ospfd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2020/12/17 00:51:13 bluhm Exp $
+#	$OpenBSD: Makefile,v 1.14 2021/12/02 17:10:53 kn Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-AnyEvent		provide framework for multiple event loops
@@ -16,7 +16,7 @@ PERL_REQUIRE != perl -Mstrict -Mwarnings -e ' \
 .if ! empty (PERL_REQUIRE)
 regress:
 	@echo "${PERL_REQUIRE}"
-	@echo install these perl packages for additional tests
+	@echo 'run "pkg_add p5-AnyEvent p5-Hash-Merge p5-YAML"'
 	@echo SKIPPED
 .endif
 
diff --git a/regress/usr.sbin/relayd/Makefile b/regress/usr.sbin/relayd/Makefile
index 3dfba83e24f..978e4a92e52 100644
--- a/regress/usr.sbin/relayd/Makefile
+++ b/regress/usr.sbin/relayd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2021/10/12 05:42:39 anton Exp $
+#	$OpenBSD: Makefile,v 1.19 2021/12/02 17:10:53 kn Exp $
 
 # The following ports must be installed for the regression tests:
 # p5-IO-Socket-INET6	object interface for AF_INET and AF_INET6 domain sockets
@@ -16,7 +16,7 @@ PERL_REQUIRE !=	perl -Mstrict -Mwarnings -e ' \
 .if ! empty (PERL_REQUIRE)
 regress:
 	@echo "${PERL_REQUIRE}"
-	@echo install these perl packages for additional tests
+	@echo 'run "pkg_add p5-IO-Socket-INET6 p5-Socket6 p5-Socket-SSL"'
 	@echo SKIPPED
 .endif