aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-12-05 09:43:22 +0100
committerIngela Anderton Andin <[email protected]>2013-12-05 09:43:22 +0100
commit44476cfc0c7985f9c5bf50c7667450e56cb60615 (patch)
tree7e92ba0d210b5d845459d026af69d3d138ab9b09
parent57caaad1be3ab68b4544eeed73ff1af7f516f219 (diff)
parentce6d89faa684f39fbd17dfb10b4f95a221b8ac9a (diff)
downloadotp-44476cfc0c7985f9c5bf50c7667450e56cb60615.tar.gz
otp-44476cfc0c7985f9c5bf50c7667450e56cb60615.tar.bz2
otp-44476cfc0c7985f9c5bf50c7667450e56cb60615.zip
Merge remote-tracking branch 'upstream/maint'
-rw-r--r--lib/inets/test/httpd_SUITE.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 5dca76b76b..ef801f91c7 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -222,6 +222,15 @@ init_per_group(ipv6 = _GroupName, Config) ->
_ ->
{skip, "Host does not support IPv6"}
end;
+init_per_group(essl, Config) ->
+ catch crypto:stop(),
+ case (catch crypto:start()) of
+ ok ->
+ Config;
+ _ ->
+ {skip, "Crypto not startable"}
+ end;
+
init_per_group(_GroupName, Config) ->
Config.