Merge branch 'bjorn/test-cases'

* bjorn/test-cases:
  lcnt_SUITE: Be kind to slow machines
  crypto_SUITE: Reinstate what was "lost in translation"
  fileTransferSUITE: Cope with missing/broken crypto application
  sensitive_SUITE: Fix spuriously failing recv_trace/1
  eprof_SUITE: Cope with fast computers and bad time measurements
  cover_SUITE: Cope with missing/broken crypto application
  otp_SUITE: Write log files about undefined functions and so on

1 files changed, 12 insertions, 3 deletions

diff --git a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
index e94c307ef8..79a234bd28 100644
--- a/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
+++ b/lib/cosFileTransfer/test/fileTransfer_SUITE.erl
@@ -131,10 +131,10 @@ end_per_testcase(_Case, Config) ->
     ok.
 
 init_per_suite(Config) ->
-    case code:which(crypto) of
-	Res when is_atom(Res) ->
+    case crypto_works() of
+	false ->
 	    {skip,"Could not start crypto!"};
-	_Else ->
+	true ->
 	    orber:jump_start(),
 	    cosProperty:install(),
 	    cosProperty:start(),
@@ -165,6 +165,15 @@ init_per_suite(Config) ->
 	    end
     end.
 
+crypto_works() ->
+    try crypto:start() of
+	{error,{already_started,crypto}} -> true;
+	ok -> true
+    catch
+	error:_ ->
+	    false
+    end.
+
 end_per_suite(Config) ->
     ssl:stop(),
     crypto:stop(),