From c6238ffaa4ef8bbe0aff8fde402a3254e746d3cc Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 20 Jan 2011 17:00:32 +0100 Subject: Skip ssl and public key tests if crypto fails to start --- lib/public_key/test/pkits_SUITE.erl | 10 +++++++--- lib/public_key/test/public_key_SUITE.erl | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'lib/public_key/test') diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl index 1d75e1aed2..e3cc694110 100644 --- a/lib/public_key/test/pkits_SUITE.erl +++ b/lib/public_key/test/pkits_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -587,8 +587,12 @@ fin_per_testcase(_Func, Config) -> Config. init_per_suite(Config) -> - crypto:start(), - Config. + case crypto:start() of + ok -> + Config; + _ -> + {skip, "Crypto did not start"} + end. end_per_suite(_Config) -> crypto:stop(). diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl index 88cfbcf2b6..3bd81a04ea 100644 --- a/lib/public_key/test/public_key_SUITE.erl +++ b/lib/public_key/test/public_key_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-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 @@ -41,9 +41,12 @@ %% variable, but should NOT alter/remove any existing entries. %%-------------------------------------------------------------------- init_per_suite(Config) -> - crypto:start(), - Config. - + case crypto:start() of + ok -> + Config; + _ -> + {skip, "Crypto did not start"} + end. %%-------------------------------------------------------------------- %% Function: end_per_suite(Config) -> _ %% Config - [tuple()] -- cgit v1.2.3