diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-07 10:07:39 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-07 10:07:39 +0100 |
| commit | 5ef5d6a216815c13ce671df07bd0125b317f5969 (patch) | |
| tree | 5aef64dab91e14a966d454c6638febbf06338a75 /lib/ssl/test/ssl_payload_SUITE.erl | |
| parent | 4ec1678553ff9b20feaa93ab108196943d14f0df (diff) | |
| parent | 7d45e56bbe2d084756fceb4e9b8065f74d1a503b (diff) | |
| download | otp-5ef5d6a216815c13ce671df07bd0125b317f5969.tar.gz otp-5ef5d6a216815c13ce671df07bd0125b317f5969.tar.bz2 otp-5ef5d6a216815c13ce671df07bd0125b317f5969.zip | |
Merge branch 'ia/workaround-crypto-start-inconsistency' into dev
* ia/workaround-crypto-start-inconsistency:
Workaround for application:start(crypto) inconsistency
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. %%-------------------------------------------------------------------- |