diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-12-08 15:15:17 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-12-08 15:15:17 +0100 |
| commit | b9a239c3a5c33819f4539380e8e8f6e8cce95072 (patch) | |
| tree | 90fb90804e4dd69796188567a03a8523afe182a3 /erts/emulator/test/map_SUITE.erl | |
| parent | 40beec43a477062dc81c4dd29eb9dc6a1db0ee9a (diff) | |
| parent | 4f3212c9a84e6feaea1bbffdc1972e4760cc7815 (diff) | |
| download | otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.tar.gz otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.tar.bz2 otp-b9a239c3a5c33819f4539380e8e8f6e8cce95072.zip | |
Merge branch 'egil/term_type/OTP-13172'
* egil/term_type/OTP-13172:
Test erts_internal:term_type/1
erts: Let term_type/1 encompass all types
erts: Change erts_internal:map_type/1 into term_type/1
Diffstat (limited to 'erts/emulator/test/map_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/map_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl index 6890c42b7a..bde0d408f3 100644 --- a/erts/emulator/test/map_SUITE.erl +++ b/erts/emulator/test/map_SUITE.erl @@ -2598,7 +2598,7 @@ hashmap_balance(KeyFun) -> F = fun(I, {M0,Max0}) -> Key = KeyFun(I), M1 = M0#{Key => Key}, - Max1 = case erts_internal:map_type(M1) of + Max1 = case erts_internal:term_type(M1) of hashmap -> Nodes = hashmap_nodes(M1), Avg = maps:size(M1) * 0.4, @@ -3004,7 +3004,7 @@ t_gc_rare_map_overflow(Config) -> Loop() end), FatMap = fatmap(34), - false = (flatmap =:= erts_internal:map_type(FatMap)), + false = (flatmap =:= erts_internal:term_type(FatMap)), t_gc_rare_map_overflow_do(Echo, FatMap, fun() -> erlang:garbage_collect() end), |