diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 14:55:11 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 14:55:11 +0100 |
| commit | c959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (patch) | |
| tree | 44857e835210e771185bdf64ac8e4a42ad003d0a /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | db29f9ede14ff5b8d747230fcad8ffa1b157f1e1 (diff) | |
| parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
| download | otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.gz otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.tar.bz2 otp-c959a0cd5392d356e8bda8d7eb9d0e71a88360b3.zip | |
Merge branch 'dev' into bmk/inets/httpc/support_upload_body_streaming/OTP-OTP-9094
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 87d5fc8d71..8495ddb1d7 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -48,7 +48,7 @@ %%-------------------------------------------------------------------- init_per_suite(Config0) -> Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2), - case application:start(crypto) of + try crypto:start() of ok -> application:start(public_key), ssl:start(), @@ -61,8 +61,8 @@ init_per_suite(Config0) -> Config1 = ssl_test_lib:make_dsa_cert(Config0), Config = ssl_test_lib:cert_options(Config1), - [{watchdog, Dog} | Config]; - _ -> + [{watchdog, Dog} | Config] + catch _:_ -> {skip, "Crypto did not start"} end. %%-------------------------------------------------------------------- |