diff options
| author | Lars Thorsen <[email protected]> | 2018-03-05 12:37:43 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2018-03-05 12:37:43 +0100 |
| commit | 7c38b79502f9ca16a20a1269bb95a5b7ca1f0adb (patch) | |
| tree | 1ab93f38d1702e2869f541f48b1e5e95e7e78dba | |
| parent | 5b17edc4b1091fd8e3618615be36f9b993cbed9c (diff) | |
| parent | 113ce3fccf83ed7983ea72ede32b277107c709f0 (diff) | |
| download | otp-7c38b79502f9ca16a20a1269bb95a5b7ca1f0adb.tar.gz otp-7c38b79502f9ca16a20a1269bb95a5b7ca1f0adb.tar.bz2 otp-7c38b79502f9ca16a20a1269bb95a5b7ca1f0adb.zip | |
Merge branch 'lars/ssl/test-config-changes/OTP-14949' into maint
* lars/ssl/test-config-changes/OTP-14949:
[ssl] Fix hanging test case on outdated lab machine
| -rw-r--r-- | lib/ssl/test/ssl_engine_SUITE.erl | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/lib/ssl/test/ssl_engine_SUITE.erl b/lib/ssl/test/ssl_engine_SUITE.erl index bc221d35fd..71891356e8 100644 --- a/lib/ssl/test/ssl_engine_SUITE.erl +++ b/lib/ssl/test/ssl_engine_SUITE.erl @@ -39,23 +39,28 @@ init_per_suite(Config) -> catch crypto:stop(), try crypto:start() of ok -> - ssl_test_lib:clean_start(), - case crypto:get_test_engine() of - {ok, EngineName} -> - try crypto:engine_load(<<"dynamic">>, - [{<<"SO_PATH">>, EngineName}, - <<"LOAD">>], - []) of - {ok, Engine} -> - [{engine, Engine} |Config]; - {error, Reason} -> - ct:pal("Reason ~p", [Reason]), - {skip, "No dynamic engine support"} - catch error:notsup -> - {skip, "No engine support in OpenSSL"} - end; - {error, notexist} -> - {skip, "Test engine not found"} + case crypto:info_lib() of + [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}] -> + {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"}; + _ -> + ssl_test_lib:clean_start(), + case crypto:get_test_engine() of + {ok, EngineName} -> + try crypto:engine_load(<<"dynamic">>, + [{<<"SO_PATH">>, EngineName}, + <<"LOAD">>], + []) of + {ok, Engine} -> + [{engine, Engine} |Config]; + {error, Reason} -> + ct:pal("Reason ~p", [Reason]), + {skip, "No dynamic engine support"} + catch error:notsup -> + {skip, "No engine support in OpenSSL"} + end; + {error, notexist} -> + {skip, "Test engine not found"} + end end catch _:_ -> {skip, "Crypto did not start"} |