mirror of https://github.com/openssl/openssl.git
evp_test: add concept of extended tests to evp_test
These tests are not run by default, instead they run when the EVP_TEST_EXTENDED environment variable has an integer value other than zero. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/26750)
This commit is contained in:
parent
a4465bf694
commit
740e43f074
|
@ -86,6 +86,7 @@ static OSSL_PROVIDER *prov_null = NULL;
|
||||||
static OSSL_PROVIDER *libprov = NULL;
|
static OSSL_PROVIDER *libprov = NULL;
|
||||||
static OSSL_LIB_CTX *libctx = NULL;
|
static OSSL_LIB_CTX *libctx = NULL;
|
||||||
static int fips_indicator_callback_unapproved_count = 0;
|
static int fips_indicator_callback_unapproved_count = 0;
|
||||||
|
static int extended_tests = 0;
|
||||||
|
|
||||||
/* List of public and private keys */
|
/* List of public and private keys */
|
||||||
static KEY_LIST *private_keys;
|
static KEY_LIST *private_keys;
|
||||||
|
@ -5195,6 +5196,12 @@ start:
|
||||||
}
|
}
|
||||||
} else if (strcmp(pp->key, "Unapproved") == 0) {
|
} else if (strcmp(pp->key, "Unapproved") == 0) {
|
||||||
t->expect_unapproved = 1;
|
t->expect_unapproved = 1;
|
||||||
|
} else if (strcmp(pp->key, "Extended-Test") == 0) {
|
||||||
|
if (!extended_tests) {
|
||||||
|
TEST_info("skipping extended test: %s:%d",
|
||||||
|
t->s.test_file, t->s.start);
|
||||||
|
t->skip = 1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
/* Must be test specific line: try to parse it */
|
/* Must be test specific line: try to parse it */
|
||||||
int rv = t->meth->parse(t, pp->key, pp->value);
|
int rv = t->meth->parse(t, pp->key, pp->value);
|
||||||
|
@ -5279,6 +5286,8 @@ int setup_tests(void)
|
||||||
|
|
||||||
OPTION_CHOICE o;
|
OPTION_CHOICE o;
|
||||||
|
|
||||||
|
extended_tests = getenv("EVP_TEST_EXTENDED") != NULL;
|
||||||
|
|
||||||
while ((o = opt_next()) != OPT_EOF) {
|
while ((o = opt_next()) != OPT_EOF) {
|
||||||
switch (o) {
|
switch (o) {
|
||||||
case OPT_CONFIG_FILE:
|
case OPT_CONFIG_FILE:
|
||||||
|
|
Loading…
Reference in New Issue