diff options
| author | Matt Caswell <matt@openssl.org> | 2016-07-22 16:19:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-07-25 08:24:32 +0100 |
| commit | 3e82ae573ad7a3aa5dc99be9841ca9111e584630 (patch) | |
| tree | aa8547318565c1331f69d8686516db3ef9bfd7a2 /test | |
| parent | 49dadc1cb74dd1c83983900b5c4acb22c647af31 (diff) | |
Fix no-dtls*
Also fixes some other options like no-dgram and no-sock.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/80-test_ssl_new.t | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 6867cc3dfc..ffffca5403 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -26,9 +26,8 @@ map { s/;.*// } @conf_srcs if $^O eq "VMS"; my @conf_files = map { basename($_) } @conf_srcs; map { s/\.in// } @conf_files; -# 02-protocol-version.conf test and 05-dtls-protocol-version.conf results -# depend on the configuration of enabled protocols. We only verify generated -# sources in the default configuration. +# 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") && !disabled("tls1_1") && !disabled("tls1_2")); @@ -41,14 +40,14 @@ my $no_npn = disabled("nextprotoneg"); my %conf_dependent_tests = ( "02-protocol-version.conf" => !$is_default_tls, "04-client_auth.conf" => !$is_default_tls, - "05-dtls-protocol-version.conf" => !$is_default_dtls, + "07-dtls-protocol-version.conf" => !$is_default_dtls, "10-resumption.conf" => !$is_default_tls, "11-dtls_resumption.conf" => !$is_default_dtls, ); # Default is $no_tls but some tests have different skip conditions. my %skip = ( - "05-dtls-protocol-version.conf" => $no_dtls, + "07-dtls-protocol-version.conf" => $no_dtls, "08-npn.conf" => $no_tls || $no_npn, "11-dtls_resumption.conf" => $no_dtls, ); |