diff options
author | Hans Nilsson <[email protected]> | 2018-10-24 10:16:19 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-10-24 10:16:19 +0200 |
commit | 2b30ac551d3febf0233f26176f4706a009e840d2 (patch) | |
tree | 811ad0020948074852455077374694a2cf425bf5 /lib/crypto/test | |
parent | cffe913039c4ce0c9702be1f410c2f2967008f68 (diff) | |
parent | 93550a678b6459b6490b1a2341207021bd4e6cb2 (diff) | |
download | otp-2b30ac551d3febf0233f26176f4706a009e840d2.tar.gz otp-2b30ac551d3febf0233f26176f4706a009e840d2.tar.bz2 otp-2b30ac551d3febf0233f26176f4706a009e840d2.zip |
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.
Diffstat (limited to 'lib/crypto/test')
-rw-r--r-- | lib/crypto/test/engine_SUITE.erl | 15 |
1 files changed, 11 insertions, 4 deletions
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; |