aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-11-20 20:44:56 +0100
committerSverker Eriksson <[email protected]>2013-11-20 20:44:56 +0100
commitd87e165b2322d72ba53a821b6eb3bc237a600703 (patch)
tree447d0c82ec0923f5ab3f725db7c1035b0c9eafe4 /erts
parent7d2867c58b5a8232284e3b168a5f17822bd51283 (diff)
parent4bace5d7cd5dfa9351cce25ea8c6882b5965f4c4 (diff)
downloadotp-d87e165b2322d72ba53a821b6eb3bc237a600703.tar.gz
otp-d87e165b2322d72ba53a821b6eb3bc237a600703.tar.bz2
otp-d87e165b2322d72ba53a821b6eb3bc237a600703.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/hash_SUITE.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/hash_SUITE.erl b/erts/emulator/test/hash_SUITE.erl
index 50667d98ed..647bb45049 100644
--- a/erts/emulator/test/hash_SUITE.erl
+++ b/erts/emulator/test/hash_SUITE.erl
@@ -31,7 +31,7 @@
%%
-module(hash_SUITE).
-export([basic_test/0,cmp_test/1,range_test/0,spread_test/1,
- phash2_test/0, otp_5292_test/0, bit_level_binaries/0,
+ phash2_test/0, otp_5292_test/0,
otp_7127_test/0]).
-compile({nowarn_deprecated_function, {erlang,hash,2}}).
@@ -151,7 +151,7 @@ otp_5292(Config) when is_list(Config) ->
%% Test hashing bit-level binaries.
bit_level_binaries(Config) when is_list(Config) ->
- bit_level_binaries().
+ bit_level_binaries_do().
otp_7127(suite) ->
[];
@@ -536,7 +536,7 @@ hash_int(Start, End, F) ->
md5(T) ->
erlang:md5(term_to_binary(T)).
-bit_level_binaries() ->
+bit_level_binaries_do() ->
[3511317,7022633,14044578,28087749,56173436,112344123,90467083|_] =
bit_level_all_different(fun erlang:hash/2),
[3511317,7022633,14044578,28087749,56173436,112344123,90467083|_] =