Merge branch 'hans/crypto/cuddle_tests' into maint

* hans/crypto/cuddle_tests:
  crypto: Fix tests failing if more than one test engine available This could happen in an Valgrind run:
  crypto: Disable engine tests on Darwin and Windows Does not work.

2 files changed, 12 insertions, 5 deletions

diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 2db73c4af0..c2ab88417e 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -2026,7 +2026,7 @@ check_otp_test_engine(LibDir) ->
     case filelib:wildcard("otp_test_engine*", LibDir) of
         [] ->
             {error, notexist};
-        [LibName] ->
+        [LibName|_] ->                          % In case of Valgrind there could be more than one
             LibPath = filename:join(LibDir,LibName),
             case filelib:is_file(LibPath) of
                 true ->
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index b083b30d70..0427923941 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -75,11 +75,18 @@ groups() ->
 
 
 init_per_suite(Config) ->
-    case crypto:info_lib() of
-        [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}] ->
+    case {os:type(), crypto:info_lib()} of
+        {_, [{_,_, <<"OpenSSL 1.0.1s-freebsd  1 Mar 2016">>}]} ->
             {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
-        Res ->
-            ct:log("crypto:info_lib() -> ~p\n", [Res]),
+
+        {{unix,darwin}, _} ->
+            {skip, "Engine unsupported on Darwin"};
+        
+        {{win32,_}, _} ->
+            {skip, "Engine unsupported on Windows"};
+        
+        {OS, Res} ->
+            ct:log("crypto:info_lib() -> ~p\nos:type() -> ~p", [Res,OS]),
             try crypto:start() of
                 ok ->
                     Config;