diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-09 18:16:54 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-09 18:16:54 +0200 |
| commit | 5ca152a5ccca92e354188f7b696ca5b9f6b92806 (patch) | |
| tree | f0b2794d847b117266d68851ce28435626ca7829 /erts/emulator/test | |
| parent | d7e7284c4f94a6cc205519692cc48835c45d342a (diff) | |
| parent | dd5087bf582bba0879fa352bdc0ddcbf06d943d2 (diff) | |
| download | otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.tar.gz otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.tar.bz2 otp-5ca152a5ccca92e354188f7b696ca5b9f6b92806.zip | |
Merge branch 'sverker/system_info-erts_mmap/OTP-13560'
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/alloc_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl index 5fb560d1ec..1f7b499dcb 100644 --- a/erts/emulator/test/alloc_SUITE.erl +++ b/erts/emulator/test/alloc_SUITE.erl @@ -102,8 +102,8 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) -> Self = self(), Ref = make_ref(), F = fun() -> - SI = erlang:system_info({allocator,mseg_alloc}), - {erts_mmap,EM} = lists:keyfind(erts_mmap, 1, SI), + SI = erlang:system_info({allocator,erts_mmap}), + {default_mmap,EM} = lists:keyfind(default_mmap, 1, SI), {supercarrier,SC} = lists:keyfind(supercarrier, 1, EM), {sizes,Sizes} = lists:keyfind(sizes, 1, SC), {free_segs,Segs} = lists:keyfind(free_segs,1,SC), |