aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2018-04-27 12:34:39 +0200
committerLars Thorsen <[email protected]>2018-04-27 12:34:39 +0200
commit757cef3dcdab5bb207168cca7fc6496c8ca66723 (patch)
tree14c1696eda0c9e092cbd5fcb50140b896bae3882
parent5b1ef96b3f2dd9e331fd6ecb1a3150e3033ea59a (diff)
parent495d56f879be31be660961393ece4d3b9103a09a (diff)
downloadotp-757cef3dcdab5bb207168cca7fc6496c8ca66723.tar.gz
otp-757cef3dcdab5bb207168cca7fc6496c8ca66723.tar.bz2
otp-757cef3dcdab5bb207168cca7fc6496c8ca66723.zip
Merge branch 'lars/crypto/test-suite-problem'
* lars/crypto/test-suite-problem: [crypto] Skip test cases for specific ssl version on old machine
-rw-r--r--lib/crypto/test/engine_SUITE.erl24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index f410542f72..3f176f165d 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -70,19 +70,21 @@ groups() ->
init_per_suite(Config) ->
- try crypto:start() of
- ok ->
- case crypto:info_lib() of
- [{_,_, <<"OpenSSL 1.0.1s-freebsd 1 Mar 2016">>}] ->
- {skip, "Problem with engine on OpenSSL 1.0.1s-freebsd"};
- _ ->
+ case 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]),
+ try crypto:start() of
+ ok ->
+ Config;
+ {error,{already_started,crypto}} ->
Config
- end;
- {error,{already_started,crypto}} ->
- Config
- catch _:_ ->
- {skip, "Crypto did not start"}
+ catch _:_ ->
+ {skip, "Crypto did not start"}
+ end
end.
+
end_per_suite(_Config) ->
ok.