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/old_ssl_dist_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/old_ssl_dist_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/old_ssl_dist_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/test/old_ssl_dist_SUITE.erl b/lib/ssl/test/old_ssl_dist_SUITE.erl index 6a072c9d98..4544fb616a 100644 --- a/lib/ssl/test/old_ssl_dist_SUITE.erl +++ b/lib/ssl/test/old_ssl_dist_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2010. All Rights Reserved. +%% Copyright Ericsson AB 2007-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -62,9 +62,15 @@ end_per_group(_GroupName, Config) -> init_per_suite(Config) -> - add_ssl_opts_config(Config). + try crypto:start() of + ok -> + add_ssl_opts_config(Config) + catch _:_ -> + {skip, "Crypto did not start"} + end. end_per_suite(Config) -> + application:stop(crypto), Config. init_per_testcase(Case, Config) when list(Config) -> |