diff options
author | John Högberg <[email protected]> | 2018-05-03 12:37:49 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-06-28 09:05:43 +0200 |
commit | c7dc896e8897988ccc033e18fa19670ba7160565 (patch) | |
tree | c0aa20a10c35fb0b5a93d23d9813bab3cc6f4514 /erts/emulator/test | |
parent | d3147dd8fc0ee913bc7146efb4d041d04f6582d8 (diff) | |
download | otp-c7dc896e8897988ccc033e18fa19670ba7160565.tar.gz otp-c7dc896e8897988ccc033e18fa19670ba7160565.tar.bz2 otp-c7dc896e8897988ccc033e18fa19670ba7160565.zip |
Allow cross-type carrier migration
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/process_SUITE.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index 585c5a1871..6775d06b4b 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -2232,8 +2232,8 @@ processes_term_proc_list(Config) when is_list(Config) -> %% We have to run this test case with +S1 since instrument:allocations() %% will report a free()'d block as present until it's actually deallocated %% by its employer. - Run("+MSe true +MSatags false +S1"), - Run("+MSe true +MSatags true +S1"), + Run("+MSe true +Muatags false +S1"), + Run("+MSe true +Muatags true +S1"), ok. @@ -2241,10 +2241,12 @@ processes_term_proc_list(Config) when is_list(Config) -> chk_term_proc_list(?LINE, MC, XB)). chk_term_proc_list(Line, MustChk, ExpectBlks) -> - Allocs = instrument:allocations(#{ allocator_types => [sl_alloc] }), + Allocs = instrument:allocations(), case {MustChk, Allocs} of {false, {error, not_enabled}} -> not_enabled; + {false, {ok, {_Shift, _Unscanned, ByOrigin}}} when ByOrigin =:= #{} -> + not_enabled; {_, {ok, {_Shift, _Unscanned, ByOrigin}}} -> ByType = maps:get(system, ByOrigin, #{}), Hist = maps:get(ptab_list_deleted_el, ByType, {}), |