diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 14:57:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 14:57:56 +0100 |
| commit | e91ecef78904be02bb785fdff0dcaf6d38176ba7 (patch) | |
| tree | 74622d0cfdd0e3c935b4600cf57c3c7a8d9ebc1d /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 2ff2b4ee1b50eb621e436f7c448808d67d6690df (diff) | |
| parent | f85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff) | |
| download | otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.gz otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.tar.bz2 otp-e91ecef78904be02bb785fdff0dcaf6d38176ba7.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
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. %%-------------------------------------------------------------------- |