aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_packet_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-01-21 09:57:22 +0100
committerIngela Anderton Andin <[email protected]>2011-01-21 09:57:22 +0100
commitc9aae9e6874950c671c08940d4e72abc616c550e (patch)
tree01e0db63432942a98355b4f34a9e034cc747df75 /lib/ssl/test/ssl_packet_SUITE.erl
parent4c70b07402581cbcdc1204961344cb28bf383d20 (diff)
parentc6238ffaa4ef8bbe0aff8fde402a3254e746d3cc (diff)
downloadotp-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/ssl/test/ssl_packet_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_packet_SUITE.erl23
1 files changed, 13 insertions, 10 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 88d2d99ef8..2fe17e1399 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_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
@@ -53,15 +53,18 @@
%% variable, but should NOT alter/remove any existing entries.
%%--------------------------------------------------------------------
init_per_suite(Config) ->
- crypto:start(),
- application:start(public_key),
- ssl:start(),
- Result =
- (catch make_certs:all(?config(data_dir, Config),
- ?config(priv_dir, Config))),
- test_server:format("Make certs ~p~n", [Result]),
- ssl_test_lib:cert_options(Config).
-
+ case crypto:start() of
+ ok ->
+ application:start(public_key),
+ ssl:start(),
+ Result =
+ (catch make_certs:all(?config(data_dir, Config),
+ ?config(priv_dir, Config))),
+ test_server:format("Make certs ~p~n", [Result]),
+ ssl_test_lib:cert_options(Config);
+ _ ->
+ {skip, "Crypto did not start"}
+ end.
%%--------------------------------------------------------------------
%% Function: end_per_suite(Config) -> _
%% Config - [tuple()]