diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-01-24 14:49:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-01-24 14:49:16 +0100 |
| commit | 2a49028427217bb7574274280524edee1e7f5d4d (patch) | |
| tree | eafc223301521b8d69249188e05cd35099906286 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | c9aae9e6874950c671c08940d4e72abc616c550e (diff) | |
| parent | ac303885b1301762f772fcb7337fdfdc97c111d6 (diff) | |
| download | otp-2a49028427217bb7574274280524edee1e7f5d4d.tar.gz otp-2a49028427217bb7574274280524edee1e7f5d4d.tar.bz2 otp-2a49028427217bb7574274280524edee1e7f5d4d.zip | |
Merge branch 'ia/ssl-and-public_key/skip-tests-when-no-crypto-fix' into dev
* ia/ssl-and-public_key/skip-tests-when-no-crypto-fix:
Changed crypto start test so that it works as intended
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index a75e9b4272..6a1b83d344 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 crypto:start() of + case application:start(crypto) of ok -> application:start(public_key), ssl:start(), @@ -73,7 +73,7 @@ init_per_suite(Config0) -> %%-------------------------------------------------------------------- end_per_suite(_Config) -> ssl:stop(), - crypto:stop(). + application:stop(crypto). %%-------------------------------------------------------------------- %% Function: init_per_testcase(TestCase, Config) -> Config |