diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-01-21 09:57:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-01-21 09:57:22 +0100 |
| commit | c9aae9e6874950c671c08940d4e72abc616c550e (patch) | |
| tree | 01e0db63432942a98355b4f34a9e034cc747df75 /lib/public_key/test | |
| parent | 4c70b07402581cbcdc1204961344cb28bf383d20 (diff) | |
| parent | c6238ffaa4ef8bbe0aff8fde402a3254e746d3cc (diff) | |
| download | otp-c9aae9e6874950c671c08940d4e72abc616c550e.tar.gz otp-c9aae9e6874950c671c08940d4e72abc616c550e.tar.bz2 otp-c9aae9e6874950c671c08940d4e72abc616c550e.zip | |
Merge branch 'ia/ssl-and-public_key/skip-test-if-no-crypto' into dev
* ia/ssl-and-public_key/skip-test-if-no-crypto:
Skip ssl and public key tests if crypto fails to start
Diffstat (limited to 'lib/public_key/test')
| -rw-r--r-- | lib/public_key/test/pkits_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/public_key/test/public_key_SUITE.erl | 11 |
2 files changed, 14 insertions, 7 deletions
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()] |