diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
| commit | 7dca6bf8cc7f291a6c1cb4928255da88afa131b1 (patch) | |
| tree | 69bd94455d96e3be7758503e80790e568223a5d7 /lib/ssl/test/ssl_ECC_SUITE.erl | |
| parent | fbf740d68600b59dc5fa7bd76d0aa0d019e81a75 (diff) | |
| parent | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (diff) | |
| download | otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.gz otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.bz2 otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 0fbb0bb79a..c48ccfb83b 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -36,7 +36,9 @@ all() -> [ {group, 'tlsv1.2'}, {group, 'tlsv1.1'}, - {group, 'tlsv1'} + {group, 'tlsv1'}, + {group, 'dtlsv1.2'}, + {group, 'dtlsv1'} ]. groups() -> @@ -44,6 +46,8 @@ groups() -> {'tlsv1.2', [], all_versions_groups()}, {'tlsv1.1', [], all_versions_groups()}, {'tlsv1', [], all_versions_groups()}, + {'dtlsv1.2', [], all_versions_groups()}, + {'dtlsv1', [], all_versions_groups()}, {'erlang_server', [], openssl_key_cert_combinations()}, %%{'erlang_client', [], openssl_key_cert_combinations()}, {'erlang', [], key_cert_combinations() ++ misc() @@ -197,7 +201,7 @@ common_init_per_group(GroupName, Config) -> end. end_per_group(_GroupName, Config) -> - Config. + proplists:delete(tls_version, Config). %%-------------------------------------------------------------------- |