In 80-test_ssl_new, more "plan tests" to a more useful position

[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 ffffca54036438f92ee0aa444247f692337cb9b7..941ace7b72d9225bdd8e56b0dee00bb93669e9e4 100644 (file)
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -26,6 +26,10 @@ map { s/;.*// } @conf_srcs if $^O eq "VMS";
 my @conf_files = map { basename($_) } @conf_srcs;
 map { s/\.in// } @conf_files;
 
+# We hard-code the number of tests to double-check that the globbing above
+# finds all files as expected.
+plan tests => 11;  # = scalar @conf_srcs
+
 # 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") &&
@@ -49,7 +53,9 @@ my %conf_dependent_tests = (
 my %skip = (
   "07-dtls-protocol-version.conf" => $no_dtls,
   "08-npn.conf" => $no_tls || $no_npn,
-  "11-dtls_resumption.conf" => $no_dtls,
+  "09-alpn.conf" => $no_tls || $no_npn,
+  "10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
+  "11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
 );
 
 foreach my $conf (@conf_files) {
@@ -60,10 +66,6 @@ foreach my $conf (@conf_files) {
     }
 }
 
-# We hard-code the number of tests to double-check that the globbing above
-# finds all files as expected.
-plan tests => 11;  # = scalar @conf_srcs
-
 sub test_conf {
     plan tests => 3;