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_payload_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_payload_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_payload_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl index f57d7fa0e8..24e86b3913 100644 --- a/lib/ssl/test/ssl_payload_SUITE.erl +++ b/lib/ssl/test/ssl_payload_SUITE.erl @@ -37,13 +37,13 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> - case application:start(crypto) of + try crypto:start() of ok -> application:start(public_key), ssl:start(), make_certs:all(?config(data_dir, Config), ?config(priv_dir, Config)), - ssl_test_lib:cert_options(Config); - _ -> + ssl_test_lib:cert_options(Config) + catch _:_ -> {skip, "Crypto did not start"} end. %%-------------------------------------------------------------------- |