diff options
| author | Lars Thorsen <[email protected]> | 2018-03-05 12:36:57 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2018-03-05 12:36:57 +0100 |
| commit | 5b17edc4b1091fd8e3618615be36f9b993cbed9c (patch) | |
| tree | 3350a92ca8d517e7687b9ac607b1265c2ce1d965 | |
| parent | 073829d18ada35a18ff681f891b0d4fbfbff5c2f (diff) | |
| parent | 26386f23a0ae27b61dd011975411eb6bb7e8898c (diff) | |
| download | otp-5b17edc4b1091fd8e3618615be36f9b993cbed9c.tar.gz otp-5b17edc4b1091fd8e3618615be36f9b993cbed9c.tar.bz2 otp-5b17edc4b1091fd8e3618615be36f9b993cbed9c.zip | |
Merge branch 'lars/crypto/test-config-changes/OTP-14949' into maint
* lars/crypto/test-config-changes/OTP-14949:
[crypto] Fix hanging test case on outdated lab machine
| -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 _:_ -> |