diff options
| author | Anders Svensson <[email protected]> | 2018-03-06 09:31:53 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2018-03-06 09:31:53 +0100 |
| commit | b750739e8ade1490b023245a1378b74655277386 (patch) | |
| tree | d8b1c126022b5250a59ae4415c3b7cc97325a8c8 /lib/crypto | |
| parent | f52f9f312d811e0a8b83b8427944f4e9b3ffd6b8 (diff) | |
| parent | 84a2ed39f035dd1a569dca370dc11876993c6ecf (diff) | |
| download | otp-b750739e8ade1490b023245a1378b74655277386.tar.gz otp-b750739e8ade1490b023245a1378b74655277386.tar.bz2 otp-b750739e8ade1490b023245a1378b74655277386.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/test/engine_SUITE.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl index f206f967c7..f410542f72 100644 --- a/lib/crypto/test/engine_SUITE.erl +++ b/lib/crypto/test/engine_SUITE.erl @@ -72,7 +72,12 @@ groups() -> init_per_suite(Config) -> try crypto:start() of ok -> - Config; + case crypto:info_lib() of + [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}] -> + {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"}; + _ -> + Config + end; {error,{already_started,crypto}} -> Config catch _:_ -> |