diff options
| author | Péter Dimitrov <[email protected]> | 2019-06-27 11:31:15 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-06-27 11:31:15 +0200 |
| commit | 1d13a0006a4211f3a8f1c48c0333194fc2a9cca5 (patch) | |
| tree | c9ceadabb8820c352a46181db0f97f2c1dbbe166 /lib | |
| parent | 37e007d6259e52c6deec0c04a2864cd33f151f6b (diff) | |
| parent | aabe0523708ff131cd46f10a93aa3458a4125bdf (diff) | |
| download | otp-1d13a0006a4211f3a8f1c48c0333194fc2a9cca5.tar.gz otp-1d13a0006a4211f3a8f1c48c0333194fc2a9cca5.tar.bz2 otp-1d13a0006a4211f3a8f1c48c0333194fc2a9cca5.zip | |
Merge branch 'maint'
* maint:
ssl: Fix ssl_basic_SUITE
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 0cdfea0ac2..f61f688589 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -309,10 +309,17 @@ init_per_group(GroupName, Config) when GroupName == basic_tls; GroupName == options; GroupName == basic; GroupName == session; - GroupName == error_handling_tests_tls; - GroupName == tls13_test_group - -> - ssl_test_lib:clean_tls_version(Config); + GroupName == error_handling_tests_tls -> + ssl_test_lib:clean_tls_version(Config); +%% Do not automatically configure TLS version for the 'tlsv1.3' group +init_per_group('tlsv1.3' = GroupName, Config) -> + case ssl_test_lib:sufficient_crypto_support(GroupName) of + true -> + ssl:start(), + Config; + false -> + {skip, "Missing crypto support"} + end; init_per_group(GroupName, Config) -> ssl_test_lib:clean_tls_version(Config), case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of |