diff options
author | Hans Nilsson <[email protected]> | 2018-10-24 10:16:25 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-10-24 10:16:25 +0200 |
commit | 87015bf28b7e144fa0de78fa423a1c09e395b1f5 (patch) | |
tree | e14c108cc6216fcbaa81fde34caf641e3c779f7c /lib/crypto/src | |
parent | 652f844eeb0b1b1fb2d845bf185529b56ba19822 (diff) | |
parent | 2b30ac551d3febf0233f26176f4706a009e840d2 (diff) | |
download | otp-87015bf28b7e144fa0de78fa423a1c09e395b1f5.tar.gz otp-87015bf28b7e144fa0de78fa423a1c09e395b1f5.tar.bz2 otp-87015bf28b7e144fa0de78fa423a1c09e395b1f5.zip |
Merge branch 'maint'
* maint:
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/src')
-rw-r--r-- | lib/crypto/src/crypto.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 68c0bcef5e..9915a5a6f3 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -2153,7 +2153,7 @@ check_otp_test_engine(LibDir) -> case filelib:wildcard("otp_test_engine*", LibDir) of [] -> {error, notexist}; - [LibName] -> + [LibName|_] -> % In case of Valgrind there could be more than one LibPath = filename:join(LibDir,LibName), case filelib:is_file(LibPath) of true -> |