diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-09-02 09:49:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-09-02 09:49:58 +0200 |
| commit | bd2fcdff3bb006d5d02d996b9bd9fa3475c24a65 (patch) | |
| tree | 838ebd472ecd4f65027e3098fb268ae2d4513831 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 5b56a49d15d10ad4a35dbc8b2a4b01486f1d5294 (diff) | |
| parent | 4b1b05ad4c5b5813ebb9e768b3fd2a3ebc0d4da0 (diff) | |
| download | otp-bd2fcdff3bb006d5d02d996b9bd9fa3475c24a65.tar.gz otp-bd2fcdff3bb006d5d02d996b9bd9fa3475c24a65.tar.bz2 otp-bd2fcdff3bb006d5d02d996b9bd9fa3475c24a65.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index b5cf6d1212..b8849d5cbd 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -212,21 +212,20 @@ end_per_suite(_Config) -> %%-------------------------------------------------------------------- init_per_group(GroupName, Config) -> - case ssl_test_lib:is_tls_version(GroupName) of + case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of true -> + ssl_test_lib:init_tls_version(GroupName), + Config; + _ -> case ssl_test_lib:sufficient_crypto_support(GroupName) of true -> - ssl_test_lib:init_tls_version(GroupName), + ssl:start(), Config; false -> {skip, "Missing crypto support"} - end; - _ -> - ssl:start(), - Config + end end. - end_per_group(_GroupName, Config) -> Config. |