80-test_ssl_new.t: make dependencies on CTLOG_FILE and TEST_CERTS_DIR explicit

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/18918)
This commit is contained in:
David von Oheimb 2022-08-11 17:46:11 +02:00 committed by Dr. David von Oheimb
parent 30eba7f359
commit 8b3ccf1cd5

View File

@ -6,6 +6,10 @@
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
# For manually running these tests, set specific environment variables like this:
# CTLOG_FILE=test/ct/log_list.cnf
# TEST_CERTS_DIR=test/certs
# For details on the environment variables needed, see test/README.ssltest.md
use strict;
use warnings;
@ -173,13 +177,14 @@ sub test_conf {
skip "No tests available; skipping tests", 1 if $skip;
skip "Stale sources; skipping tests", 1 if !$run_test;
my $msg = "running CTLOG_FILE=test/ct/log_list.cnf". # $ENV{CTLOG_FILE}.
" TEST_CERTS_DIR=test/certs". # $ENV{TEST_CERTS_DIR}.
" test/ssl_test test/ssl-tests/$conf $provider";
if ($provider eq "fips") {
ok(run(test(["ssl_test", $output_file, $provider,
srctop_file("test", "fips-and-base.cnf")])),
"running ssl_test $conf");
srctop_file("test", "fips-and-base.cnf")])), $msg);
} else {
ok(run(test(["ssl_test", $output_file, $provider])),
"running ssl_test $conf");
ok(run(test(["ssl_test", $output_file, $provider])), $msg);
}
}
}