Update init_per_suite to skip all tests if crypto does not exist

9 files changed, 129 insertions, 85 deletions

diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
index 3e27d7b83b..63eeb517bf 100644
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -131,33 +131,38 @@ end_per_testcase(_Case, Config) ->
     ok.
 
 init_per_suite(Config) ->
-    orber:jump_start(),
-    cosProperty:install(),
-    cosProperty:start(),
-    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    %% Client
-    cosFileTransferApp:configure(ssl_client_certfile,
-				 filename:join([Dir, "client", "cert.pem"])),
-    cosFileTransferApp:configure(ssl_client_cacertfile,
-				 filename:join([Dir, "client", "cacerts.pem"])),
-    cosFileTransferApp:configure(ssl_client_verify, 1),
-    cosFileTransferApp:configure(ssl_client_depth, 0),
-    %% Server
-    cosFileTransferApp:configure(ssl_server_certfile,
-				 filename:join([Dir, "server", "cert.pem"])),
-    cosFileTransferApp:configure(ssl_server_cacertfile,
-				 filename:join([Dir, "server", "cacerts.pem"])),
-    cosFileTransferApp:configure(ssl_server_verify, 1),
-    cosFileTransferApp:configure(ssl_server_depth, 0),
-    crypto:start(),
-    ssl:start(),
-    cosFileTransferApp:install(),
-    cosFileTransferApp:start(),
-    if
-        is_list(Config) ->
-	    Config;
-        true ->
-            exit("Config not a list")
+    case code:which(crypto) of
+	Res when is_atom(Res) ->
+	    {skip,"Could not start crypto!"};
+	_Else ->
+	    orber:jump_start(),
+	    cosProperty:install(),
+	    cosProperty:start(),
+	    Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
+	    %% Client
+	    cosFileTransferApp:configure(ssl_client_certfile,
+					 filename:join([Dir, "client", "cert.pem"])),
+	    cosFileTransferApp:configure(ssl_client_cacertfile,
+					 filename:join([Dir, "client", "cacerts.pem"])),
+	    cosFileTransferApp:configure(ssl_client_verify, 1),
+	    cosFileTransferApp:configure(ssl_client_depth, 0),
+	    %% Server
+	    cosFileTransferApp:configure(ssl_server_certfile,
+					 filename:join([Dir, "server", "cert.pem"])),
+	    cosFileTransferApp:configure(ssl_server_cacertfile,
+					 filename:join([Dir, "server", "cacerts.pem"])),
+	    cosFileTransferApp:configure(ssl_server_verify, 1),
+	    cosFileTransferApp:configure(ssl_server_depth, 0),
+	    crypto:start(),
+	    ssl:start(),
+	    cosFileTransferApp:install(),
+	    cosFileTransferApp:start(),
+	    if
+		is_list(Config) ->
+		    Config;
+		true ->
+		    exit("Config not a list")
+	    end
     end.
 
 end_per_suite(Config) ->
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl
index 4ebcb2c7a0..36fbc59f00 100644
--- a/lib/crypto/test/blowfish_SUITE.erl
+++ b/lib/crypto/test/blowfish_SUITE.erl
@@ -45,8 +45,12 @@
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    crypto:start(),
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
diff --git a/lib/ssl/test/old_ssl_active_SUITE.erl b/lib/ssl/test/old_ssl_active_SUITE.erl
index 096794ec54..3b8326895d 100644
--- a/lib/ssl/test/old_ssl_active_SUITE.erl
+++ b/lib/ssl/test/old_ssl_active_SUITE.erl
@@ -88,20 +88,25 @@ init_per_suite(Config) ->
     %% operating system, version of OTP, Erts, kernel and stdlib. 
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_return_chkclose(doc) ->
diff --git a/lib/ssl/test/old_ssl_active_once_SUITE.erl b/lib/ssl/test/old_ssl_active_once_SUITE.erl
index 16b323e26a..9f2eef4d49 100644
--- a/lib/ssl/test/old_ssl_active_once_SUITE.erl
+++ b/lib/ssl/test/old_ssl_active_once_SUITE.erl
@@ -80,20 +80,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 server_accept_timeout(doc) ->
diff --git a/lib/ssl/test/old_ssl_misc_SUITE.erl b/lib/ssl/test/old_ssl_misc_SUITE.erl
index 039f766d96..04760008c5 100644
--- a/lib/ssl/test/old_ssl_misc_SUITE.erl
+++ b/lib/ssl/test/old_ssl_misc_SUITE.erl
@@ -66,20 +66,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto!"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 seed(doc) ->
diff --git a/lib/ssl/test/old_ssl_passive_SUITE.erl b/lib/ssl/test/old_ssl_passive_SUITE.erl
index 80dee2899d..d7ed42148c 100644
--- a/lib/ssl/test/old_ssl_passive_SUITE.erl
+++ b/lib/ssl/test/old_ssl_passive_SUITE.erl
@@ -79,20 +79,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 server_accept_timeout(doc) ->
diff --git a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
index 9e9838cf44..56404af1c3 100644
--- a/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
+++ b/lib/ssl/test/old_ssl_peer_cert_SUITE.erl
@@ -66,20 +66,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_plain(doc) ->
diff --git a/lib/ssl/test/old_ssl_protocol_SUITE.erl b/lib/ssl/test/old_ssl_protocol_SUITE.erl
index 0a30c4702b..a957680e20 100644
--- a/lib/ssl/test/old_ssl_protocol_SUITE.erl
+++ b/lib/ssl/test/old_ssl_protocol_SUITE.erl
@@ -64,20 +64,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no other purpose than closing the conf case.";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 %%%%%
diff --git a/lib/ssl/test/old_ssl_verify_SUITE.erl b/lib/ssl/test/old_ssl_verify_SUITE.erl
index 2cd7d12f9f..2bde2865f5 100644
--- a/lib/ssl/test/old_ssl_verify_SUITE.erl
+++ b/lib/ssl/test/old_ssl_verify_SUITE.erl
@@ -65,20 +65,25 @@ init_per_suite(Config) ->
     io:format("Config: ~p~n", [Config]),
 
     %% Check if SSL exists. If this case fails, all other cases are skipped
-    crypto:start(),
-    application:start(public_key),
-    case ssl:start() of
-	ok -> ssl:stop();
-	{error, {already_started, _}} -> ssl:stop();
-	Error -> ?t:fail({failed_starting_ssl,Error})
-    end,
-    Config.
+    case catch crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    case ssl:start() of
+		ok -> ssl:stop();
+		{error, {already_started, _}} -> ssl:stop();
+		Error -> ?t:fail({failed_starting_ssl,Error})
+	    end,
+	    Config;
+	_Else ->
+	    {skip,"Could not start crypto"}
+    end.
 
 end_per_suite(doc) ->
     "This test case has no mission other than closing the conf case";
 end_per_suite(suite) ->
     [];
 end_per_suite(Config) ->
+    crypto:stop(),
     Config.
 
 cinit_both_verify(doc) ->