zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make running individual ssl-test easier

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18407)
This commit is contained in:
Todd Short 2022-05-25 11:39:20 -04:00 committed by Todd Short
parent abe90105ba
commit eec204f4b1
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/README.ssltest.md
View File

@ -283,3 +283,14 @@ of the generated `test/ssl-tests/*.cnf` correspond to expected outputs in with
the default Configure options. To run `ssl_test` manually from the command line
in a build with a different configuration, you may need to generate the right
`*.cnf` file from the `*.cnf.in` input first.
Running a test manually via make
--------------------------------
Individual tests may be run by adding the SSL_TESTS variable to the `make`
command line. The SSL_TESTS variable is set to the list of input (or ".in")
files. The values in SSL_TESTS are globbed.
$ make test TESTS=test_ssl_new SSL_TESTS="0*.cnf.in"
$ make test TESTS=test_ssl_new SSL_TESTS="01-simple.cnf.in 05-sni.cnf.in"

18
test/recipes/80-test_ssl_new.t
View File

@ -27,15 +27,23 @@ my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
$ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs");
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.cnf.in"));
my @conf_srcs = ();
if (defined $ENV{SSL_TESTS}) {
my @conf_list = split(' ', $ENV{SSL_TESTS});
foreach my $conf_file (@conf_list) {
push (@conf_srcs, glob(srctop_file("test", "ssl-tests", $conf_file)));
}
plan tests => scalar @conf_srcs;
} else {
@conf_srcs = glob(srctop_file("test", "ssl-tests", "*.cnf.in"));
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
plan tests => 30;
}
map { s/;.*// } @conf_srcs if $^O eq "VMS";
my @conf_files = map { basename($_, ".in") } @conf_srcs;
map { s/\^// } @conf_files if $^O eq "VMS";
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
plan tests => 30;
# Some test results depend on the configuration of enabled protocols. We only
# verify generated sources in the default configuration.
my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&