diff options
| author | tb <> | 2020-10-29 06:05:12 +0000 |
|---|---|---|
| committer | tb <> | 2020-10-29 06:05:12 +0000 |
| commit | 95c9379bd7f97970855501776826f244aaf2482f (patch) | |
| tree | 2b1c0a41f83390e53f9abaced6a05489fdab1744 /src/regress/lib/libssl/interop/botan | |
| parent | 0ca4c9d221f1ab6d66099fa5e1803a24c8b3331a (diff) | |
| download | openbsd-95c9379bd7f97970855501776826f244aaf2482f.tar.gz openbsd-95c9379bd7f97970855501776826f244aaf2482f.tar.bz2 openbsd-95c9379bd7f97970855501776826f244aaf2482f.zip | |
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
Diffstat (limited to 'src/regress/lib/libssl/interop/botan')
| -rw-r--r-- | src/regress/lib/libssl/interop/botan/Makefile | 6 |
1 files changed, 4 insertions, 2 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 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.1 2020/09/15 01:45:16 bluhm Exp $ | 1 | # $OpenBSD: Makefile,v 1.2 2020/10/29 06:05:12 tb Exp $ |
| 2 | 2 | ||
| 3 | .if ! exists(/usr/local/bin/botan) | 3 | .if ! exists(/usr/local/bin/botan) |
| 4 | regress: | 4 | regress: |
| 5 | # install botan2 from ports for interop tests | 5 | # install botan2 from ports for interop tests |
| 6 | @echo SKIPPED | 6 | @echo SKIPPED |
| 7 | .endif | 7 | .else |
| 8 | 8 | ||
| 9 | LIBRARIES = libressl | 9 | LIBRARIES = libressl |
| 10 | .if exists(/usr/local/bin/eopenssl) | 10 | .if exists(/usr/local/bin/eopenssl) |
| @@ -67,4 +67,6 @@ server.crt: ca.crt ${@:R}.req | |||
| 67 | /usr/local/bin/botan sign_cert ca.crt ca.key ${@:R}.req >$@.tmp | 67 | /usr/local/bin/botan sign_cert ca.crt ca.key ${@:R}.req >$@.tmp |
| 68 | mv $@.tmp $@ | 68 | mv $@.tmp $@ |
| 69 | 69 | ||
| 70 | .endif # exists(/usr/local/bin/botan) | ||
| 71 | |||
| 70 | .include <bsd.regress.mk> | 72 | .include <bsd.regress.mk> |