diff options
| author | Pauli <pauli@openssl.org> | 2021-04-29 12:38:23 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-04-30 17:51:44 +1000 |
| commit | 38230e30118e434ca1c41d05d03fe2c41042d97d (patch) | |
| tree | b873f8d0de82c6731e70323f500132045f90336c | |
| parent | 455f2542526ba3aa0db16dc8c4a5289d7f3e6b50 (diff) | |
| download | openssl-new-38230e30118e434ca1c41d05d03fe2c41042d97d.tar.gz | |
acvp: fix the no-acvp_test build
A pair of the disabled string checks were incorrect.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15082)
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | test/build.info | 6 | ||||
| -rw-r--r-- | test/recipes/30-test_acvp.t | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -379,7 +379,7 @@ my @dtls = qw(dtls1 dtls1_2); # For developers: keep it sorted alphabetically my @disablables = ( - "acvp_tests", + "acvp-tests", "afalgeng", "aria", "asan", diff --git a/INSTALL.md b/INSTALL.md index f9b065d764..9414556427 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -521,7 +521,7 @@ never be used in production environments. It will only work when used with gcc or clang and should be used in conjunction with the [no-shared](#no-shared) option. -### no-acvp_tests +### no-acvp-tests Do not build support for Automated Cryptographic Validation Protocol (ACVP) tests. diff --git a/test/build.info b/test/build.info index 8043f0d3be..98b94801e1 100644 --- a/test/build.info +++ b/test/build.info @@ -34,7 +34,7 @@ IF[{- !$disabled{tests} -}] destest mdc2test \ exptest \ evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \ - evp_fetch_prov_test acvp_test evp_libctx_test ossl_store_test \ + evp_fetch_prov_test evp_libctx_test ossl_store_test \ v3nametest v3ext \ evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \ evp_fetch_prov_test v3nametest v3ext \ @@ -159,7 +159,9 @@ IF[{- !$disabled{tests} -}] INCLUDE[evp_pkey_provided_test]=../include ../apps/include DEPEND[evp_pkey_provided_test]=../libcrypto.a libtestutil.a - IF[{- !$disabled{acvp-tests} -}] + IF[{- !$disabled{'acvp-tests'} -}] + PROGRAMS{noinst}=acvp_test + SOURCE[acvp_test]=acvp_test.c INCLUDE[acvp_test]=../include ../apps/include DEPEND[acvp_test]=../libcrypto.a libtestutil.a diff --git a/test/recipes/30-test_acvp.t b/test/recipes/30-test_acvp.t index 8f36325f21..566c59d78e 100644 --- a/test/recipes/30-test_acvp.t +++ b/test/recipes/30-test_acvp.t @@ -19,7 +19,7 @@ setup("test_acvp"); my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0); plan skip_all => "ACVP is not supported by this test" - if $no_fips || disabled("acvp_tests"); + if $no_fips || disabled("acvp-tests"); use lib srctop_dir('Configurations'); use lib bldtop_dir('.'); |