diff options
author | Lukas Larsson <[email protected]> | 2011-01-24 14:01:06 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2011-02-17 17:42:39 +0100 |
commit | 3d3251d2f371499e7af7b77335b4392f4ffaa465 (patch) | |
tree | 8cf2ce27df8b95e92246c3c36ee96dd84a9ae513 /lib/ssl/test/old_ssl_active_SUITE.erl | |
parent | ede974119a7642cf3b85dc370090e80862191dd7 (diff) | |
download | otp-3d3251d2f371499e7af7b77335b4392f4ffaa465.tar.gz otp-3d3251d2f371499e7af7b77335b4392f4ffaa465.tar.bz2 otp-3d3251d2f371499e7af7b77335b4392f4ffaa465.zip |
Update init_per_suite to skip all tests if crypto does not exist
Diffstat (limited to 'lib/ssl/test/old_ssl_active_SUITE.erl')
-rw-r--r-- | lib/ssl/test/old_ssl_active_SUITE.erl | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl index 096794ec54..3b8326895d 100644 --- a/lib/ssl/test/old_ssl_active_SUITE.erl +++ b/lib/ssl/test/old_ssl_active_SUITE.erl @@ -88,20 +88,25 @@ init_per_suite(Config) -> %% operating system, version of OTP, Erts, kernel and stdlib. %% Check if SSL exists. If this case fails, all other cases are skipped - crypto:start(), - application:start(public_key), - case ssl:start() of - ok -> ssl:stop(); - {error, {already_started, _}} -> ssl:stop(); - Error -> ?t:fail({failed_starting_ssl,Error}) - end, - Config. + case catch crypto:start() of + ok -> + application:start(public_key), + case ssl:start() of + ok -> ssl:stop(); + {error, {already_started, _}} -> ssl:stop(); + Error -> ?t:fail({failed_starting_ssl,Error}) + end, + Config; + _Else -> + {skip,"Could not start crypto!"} + end. end_per_suite(doc) -> "This test case has no mission other than closing the conf case"; end_per_suite(suite) -> []; end_per_suite(Config) -> + crypto:stop(), Config. cinit_return_chkclose(doc) -> |