aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/test
diff options
context:
space:
mode:
authorKenneth Lundin <[email protected]>2011-03-08 17:26:32 +0100
committerKenneth Lundin <[email protected]>2011-03-08 17:26:32 +0100
commit00eac4ea859ea5cade4942dc8219355d7bca6149 (patch)
tree6504c7b5cb148ee9e7defc6fa677271c9f8c10e1 /lib/public_key/test
parent26d701c1c334d41a43712b71c11d61995cecd279 (diff)
parentdea83e25a671b0bc2661582c3227c1728d69bfea (diff)
downloadotp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.gz
otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.bz2
otp-00eac4ea859ea5cade4942dc8219355d7bca6149.zip
Merge branch 'dev' of super:otp into dev
Diffstat (limited to 'lib/public_key/test')
-rw-r--r--lib/public_key/test/pkits_SUITE.erl6
-rw-r--r--lib/public_key/test/public_key_SUITE.erl6
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.
%%--------------------------------------------------------------------