diff options
author | kn <> | 2021-12-02 17:10:53 +0000 |
---|---|---|
committer | kn <> | 2021-12-02 17:10:53 +0000 |
commit | b5d39b69357a51c124fee3d534973a83056efa7b (patch) | |
tree | d46bbe1d190f09fca4312b83d264ea029a3c92d8 /src | |
parent | abffc34ff9ac2c1d8a12489536d47b0fc9ea5c79 (diff) | |
download | openbsd-b5d39b69357a51c124fee3d534973a83056efa7b.tar.gz openbsd-b5d39b69357a51c124fee3d534973a83056efa7b.tar.bz2 openbsd-b5d39b69357a51c124fee3d534973a83056efa7b.zip |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/regress/lib/libssl/interop/botan/Makefile | 4 | ||||
-rw-r--r-- | src/regress/lib/libssl/interop/openssl/Makefile | 3 | ||||
-rw-r--r-- | src/regress/lib/libssl/interop/openssl11/Makefile | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/interop/botan/Makefile b/src/regress/lib/libssl/interop/botan/Makefile index a162ee9e17..ea9517dc6d 100644 --- a/src/regress/lib/libssl/interop/botan/Makefile +++ b/src/regress/lib/libssl/interop/botan/Makefile | |||
@@ -1,14 +1,16 @@ | |||
1 | # $OpenBSD: Makefile,v 1.4 2020/12/17 00:51:11 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.5 2021/12/02 17:10:53 kn Exp $ |
2 | 2 | ||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
4 | 4 | ||
5 | .if ! exists(/usr/local/bin/botan) | 5 | .if ! exists(/usr/local/bin/botan) |
6 | regress: | 6 | regress: |
7 | # install botan2 from ports for interop tests | 7 | # install botan2 from ports for interop tests |
8 | @echo 'Run "pkg_add botan2" to run tests against Botan 2' | ||
8 | @echo SKIPPED | 9 | @echo SKIPPED |
9 | .elif (${COMPILER_VERSION:L} != "clang" && ! exists(/usr/local/bin/eg++)) | 10 | .elif (${COMPILER_VERSION:L} != "clang" && ! exists(/usr/local/bin/eg++)) |
10 | regress: | 11 | regress: |
11 | # on gcc-archs install g++ from ports for botan2 interop tests | 12 | # on gcc-archs install g++ from ports for botan2 interop tests |
13 | @echo 'Run "pkg_add g++" to run tests against Botan 2 on GCC architectures' | ||
12 | @echo SKIPPED | 14 | @echo SKIPPED |
13 | .else | 15 | .else |
14 | 16 | ||
diff --git a/src/regress/lib/libssl/interop/openssl/Makefile b/src/regress/lib/libssl/interop/openssl/Makefile index 181d35aa02..53c51a83ee 100644 --- a/src/regress/lib/libssl/interop/openssl/Makefile +++ b/src/regress/lib/libssl/interop/openssl/Makefile | |||
@@ -1,8 +1,9 @@ | |||
1 | # $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.9 2021/12/02 17:10:53 kn Exp $ |
2 | 2 | ||
3 | .if ! exists(/usr/local/bin/eopenssl) | 3 | .if ! exists(/usr/local/bin/eopenssl) |
4 | regress: | 4 | regress: |
5 | # install openssl-1.0.2 from ports for interop tests | 5 | # install openssl-1.0.2 from ports for interop tests |
6 | @echo 'Run "pkg_add openssl--%1.0.2" to run tests against OpenSSL 1.0.2' | ||
6 | @echo SKIPPED | 7 | @echo SKIPPED |
7 | .else | 8 | .else |
8 | 9 | ||
diff --git a/src/regress/lib/libssl/interop/openssl11/Makefile b/src/regress/lib/libssl/interop/openssl11/Makefile index 32fd611ae4..27e7354925 100644 --- a/src/regress/lib/libssl/interop/openssl11/Makefile +++ b/src/regress/lib/libssl/interop/openssl11/Makefile | |||
@@ -1,8 +1,9 @@ | |||
1 | # $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.8 2021/12/02 17:10:53 kn Exp $ |
2 | 2 | ||
3 | .if ! exists(/usr/local/bin/eopenssl11) | 3 | .if ! exists(/usr/local/bin/eopenssl11) |
4 | regress: | 4 | regress: |
5 | # install openssl-1.1 from ports for interop tests | 5 | # install openssl-1.1 from ports for interop tests |
6 | @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1' | ||
6 | @echo SKIPPED | 7 | @echo SKIPPED |
7 | .else | 8 | .else |
8 | 9 | ||