mirror of https://github.com/openssl/openssl
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)
This commit is contained in:
parent
455f254252
commit
38230e3011
|
@ -379,7 +379,7 @@ my @dtls = qw(dtls1 dtls1_2);
|
||||||
# For developers: keep it sorted alphabetically
|
# For developers: keep it sorted alphabetically
|
||||||
|
|
||||||
my @disablables = (
|
my @disablables = (
|
||||||
"acvp_tests",
|
"acvp-tests",
|
||||||
"afalgeng",
|
"afalgeng",
|
||||||
"aria",
|
"aria",
|
||||||
"asan",
|
"asan",
|
||||||
|
|
|
@ -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)
|
gcc or clang and should be used in conjunction with the [no-shared](#no-shared)
|
||||||
option.
|
option.
|
||||||
|
|
||||||
### no-acvp_tests
|
### no-acvp-tests
|
||||||
|
|
||||||
Do not build support for Automated Cryptographic Validation Protocol (ACVP)
|
Do not build support for Automated Cryptographic Validation Protocol (ACVP)
|
||||||
tests.
|
tests.
|
||||||
|
|
|
@ -34,7 +34,7 @@ IF[{- !$disabled{tests} -}]
|
||||||
destest mdc2test \
|
destest mdc2test \
|
||||||
exptest \
|
exptest \
|
||||||
evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
|
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 \
|
v3nametest v3ext \
|
||||||
evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
|
evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
|
||||||
evp_fetch_prov_test v3nametest v3ext \
|
evp_fetch_prov_test v3nametest v3ext \
|
||||||
|
@ -159,7 +159,9 @@ IF[{- !$disabled{tests} -}]
|
||||||
INCLUDE[evp_pkey_provided_test]=../include ../apps/include
|
INCLUDE[evp_pkey_provided_test]=../include ../apps/include
|
||||||
DEPEND[evp_pkey_provided_test]=../libcrypto.a libtestutil.a
|
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
|
SOURCE[acvp_test]=acvp_test.c
|
||||||
INCLUDE[acvp_test]=../include ../apps/include
|
INCLUDE[acvp_test]=../include ../apps/include
|
||||||
DEPEND[acvp_test]=../libcrypto.a libtestutil.a
|
DEPEND[acvp_test]=../libcrypto.a libtestutil.a
|
||||||
|
|
|
@ -19,7 +19,7 @@ setup("test_acvp");
|
||||||
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
|
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
|
||||||
|
|
||||||
plan skip_all => "ACVP is not supported by this test"
|
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 srctop_dir('Configurations');
|
||||||
use lib bldtop_dir('.');
|
use lib bldtop_dir('.');
|
||||||
|
|
Loading…
Reference in New Issue