diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-12 04:53:40 +0200 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-10-11 14:38:01 +0200 |
commit | 71a64af3312d4dfdff2597a979868d2bdd7e3642 (patch) | |
tree | c8083db5ee670ba99af9d76f9097e80602bd24fa /test | |
parent | Make no-psk compile without warnings. (diff) | |
download | openssl-71a64af3312d4dfdff2597a979868d2bdd7e3642.tar.xz openssl-71a64af3312d4dfdff2597a979868d2bdd7e3642.zip |
Skip PSK tests for no-psk
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/80-test_ssl.t | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t index f84425dfd4..6e5e22e49b 100644 --- a/test/recipes/80-test_ssl.t +++ b/test/recipes/80-test_ssl.t @@ -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 { |