projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix no-dtls*
[openssl.git]
/
test
/
recipes
/
80-test_ssl_new.t
diff --git
a/test/recipes/80-test_ssl_new.t
b/test/recipes/80-test_ssl_new.t
index 56afb6463cd341e0d9bfdc88691f4134dbd0ef0b..ffffca54036438f92ee0aa444247f692337cb9b7 100644
(file)
--- 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;
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"));
my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&
!disabled("tls1_1") && !disabled("tls1_2"));
@@
-41,13
+40,16
@@
my $no_npn = disabled("nextprotoneg");
my %conf_dependent_tests = (
"02-protocol-version.conf" => !$is_default_tls,
"04-client_auth.conf" => !$is_default_tls,
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 = (
);
# Default is $no_tls but some tests have different skip conditions.
my %skip = (
- "0
5
-dtls-protocol-version.conf" => $no_dtls,
+ "0
7
-dtls-protocol-version.conf" => $no_dtls,
"08-npn.conf" => $no_tls || $no_npn,
"08-npn.conf" => $no_tls || $no_npn,
+ "11-dtls_resumption.conf" => $no_dtls,
);
foreach my $conf (@conf_files) {
);
foreach my $conf (@conf_files) {
@@
-60,7
+62,7
@@
foreach my $conf (@conf_files) {
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
# We hard-code the number of tests to double-check that the globbing above
# finds all files as expected.
-plan tests =>
9
; # = scalar @conf_srcs
+plan tests =>
11
; # = scalar @conf_srcs
sub test_conf {
plan tests => 3;
sub test_conf {
plan tests => 3;