aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-10-24 10:16:19 +0200
committerHans Nilsson <[email protected]>2018-10-24 10:16:19 +0200
commit2b30ac551d3febf0233f26176f4706a009e840d2 (patch)
tree811ad0020948074852455077374694a2cf425bf5 /lib/crypto/src
parentcffe913039c4ce0c9702be1f410c2f2967008f68 (diff)
parent93550a678b6459b6490b1a2341207021bd4e6cb2 (diff)
downloadotp-2b30ac551d3febf0233f26176f4706a009e840d2.tar.gz
otp-2b30ac551d3febf0233f26176f4706a009e840d2.tar.bz2
otp-2b30ac551d3febf0233f26176f4706a009e840d2.zip
Merge branch 'hans/crypto/cuddle_tests' into maint
* hans/crypto/cuddle_tests: 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.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 2db73c4af0..c2ab88417e 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -2026,7 +2026,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 ->