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/public_key | |
| 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/public_key')
| -rw-r--r-- | lib/public_key/test/pkits_SUITE.erl | 6 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl index fd976cb2f3..660af4e8ab 100644 --- a/lib/public_key/test/pkits_SUITE.erl +++ b/lib/public_key/test/pkits_SUITE.erl @@ -585,10 +585,10 @@ end_per_testcase(_Func, Config) -> Config. init_per_suite(Config) -> - case application:start(crypto) of + try crypto:start() of ok -> - Config; - _ -> + Config + catch _:_ -> {skip, "Crypto did not start"} end. diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index d130196c15..6c482f9c30 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -41,10 +41,10 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> - case application:start(crypto) of + try crypto:start() of ok -> - Config; - _ -> + Config + catch _:_ -> {skip, "Crypto did not start"} end. %%-------------------------------------------------------------------- |