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

1 files changed, 17 insertions, 14 deletions

diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index d3e846f60b..a75e9b4272 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -48,20 +48,23 @@
 %%--------------------------------------------------------------------
 init_per_suite(Config0) ->
     Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
-    crypto:start(),
-    application:start(public_key),
-    ssl:start(),
-    
-    %% make rsa certs using oppenssl
-    Result = 
-	(catch make_certs:all(?config(data_dir, Config0), 
-			      ?config(priv_dir, Config0))),
-    test_server:format("Make certs  ~p~n", [Result]),
-
-    Config1 = ssl_test_lib:make_dsa_cert(Config0),
-    Config = ssl_test_lib:cert_options(Config1),
-    [{watchdog, Dog} | Config].
-
+    case crypto:start() of
+	ok ->
+	    application:start(public_key),
+	    ssl:start(),
+
+	    %% make rsa certs using oppenssl
+	    Result =
+		(catch make_certs:all(?config(data_dir, Config0),
+				      ?config(priv_dir, Config0))),
+	    test_server:format("Make certs  ~p~n", [Result]),
+
+	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
+	    Config = ssl_test_lib:cert_options(Config1),
+	    [{watchdog, Dog} | Config];
+	_ ->
+	    {skip, "Crypto did not start"}
+    end.
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
 %% Config - [tuple()]