diff options
-rw-r--r-- | src/regress/lib/libcrypto/Makefile | 4 | ||||
-rw-r--r-- | src/regress/lib/libcrypto/botan/Makefile | 21 |
2 files changed, 1 insertions, 24 deletions
diff --git a/src/regress/lib/libcrypto/Makefile b/src/regress/lib/libcrypto/Makefile index f29e594535..c98dc2dc5c 100644 --- a/src/regress/lib/libcrypto/Makefile +++ b/src/regress/lib/libcrypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.43 2022/02/11 16:34:23 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.44 2022/06/28 15:46:07 bluhm Exp $ |
2 | 2 | ||
3 | SUBDIR += aead | 3 | SUBDIR += aead |
4 | SUBDIR += aeswrap | 4 | SUBDIR += aeswrap |
@@ -54,8 +54,6 @@ SUBDIR += symbols | |||
54 | SUBDIR += utf8 | 54 | SUBDIR += utf8 |
55 | SUBDIR += wycheproof | 55 | SUBDIR += wycheproof |
56 | SUBDIR += x509 | 56 | SUBDIR += x509 |
57 | # botan tests take 50 seconds, move to the end to fail early in other tests | ||
58 | SUBDIR += botan | ||
59 | 57 | ||
60 | install: | 58 | install: |
61 | 59 | ||
diff --git a/src/regress/lib/libcrypto/botan/Makefile b/src/regress/lib/libcrypto/botan/Makefile deleted file mode 100644 index 416b0f7081..0000000000 --- a/src/regress/lib/libcrypto/botan/Makefile +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # $OpenBSD: Makefile,v 1.2 2019/05/14 05:48:58 bluhm Exp $ | ||
2 | |||
3 | .if ! exists(/usr/local/bin/botan-test) | ||
4 | regress: | ||
5 | # install botan2 from ports for botan tests with libressl provider | ||
6 | # pkg_add botan2 | ||
7 | @echo SKIPPED | ||
8 | .endif | ||
9 | |||
10 | # The Botan library from ports an be configured to use OpenSSL or | ||
11 | # LibreSSL as crypto provider. When we run their regression tests, | ||
12 | # we are actually testing our library. This is far from perfect. A | ||
13 | # lot of LibreSSL features have not been implemented as Botan provider. | ||
14 | # Even if provider openssl is specified, botan-test runs a lot of | ||
15 | # non-openssl tests. This can be improved later. | ||
16 | |||
17 | REGRESS_TARGETS= run-regress | ||
18 | run-regress: | ||
19 | /usr/local/bin/botan-test --provider=openssl | ||
20 | |||
21 | .include <bsd.regress.mk> | ||