Test suite: minimal required to get mingw 'make test' work under Linux.

[openssl.git] / test / recipes / 80-test_ssl.t

diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index f84425dfd4ec752d57f5925e5f31944773569f36..5f520ded1136dd549915b7abd11ac6bc5945decc 100644 (file)
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -414,7 +414,7 @@ sub testssl {
                      map { split(/:/, $_) }
                      run(app(["openssl", "ciphers", "${_}:$ciphers"]),
                           capture => 1);
-                 chomp @c;
+                 map { s/\R//; } @c;  # chomp @c;
                  $protocolciphersuitcount += scalar @c;
                  $_ => [ @c ] } @protocols;
 
@@ -468,11 +468,19 @@ sub testssl {
                 'test tlsv1 with 1024bit RSA, 1024bit DHE, multiple handshakes');
            }
        }
-       ok(run(test([@ssltest, "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
-          'test tls1 with PSK');
+    {
+        SKIP: {
+               skip "skipping PSK tests", 2
+               if ($no_psk);
+
+               ok(run(test([@ssltest, "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
+               'test tls1 with PSK');
+
+               ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
+               'test tls1 with PSK via BIO pair');
+        }
+    }
 
-       ok(run(test([@ssltest, "-bio_pair", "-tls1", "-cipher", "PSK", "-psk", "abc123", @extra])),
-          'test tls1 with PSK via BIO pair');
     };
 
     subtest 'Next Protocol Negotiation Tests' => sub {