diff options
| author | John Högberg <[email protected]> | 2018-07-03 09:33:02 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-03 09:33:02 +0200 |
| commit | 6cfa8af60a9c6fe9043e4992434d40d4a34019e3 (patch) | |
| tree | 822993e0a4fb987014238369db045bf53eaafba3 /erts/emulator/test/process_SUITE.erl | |
| parent | bc22321f10c1ad71fb7e28275a8e6ed26a34d4ab (diff) | |
| parent | 29ce7ab0e4403fa688d1e5e5e2170e88d7e8f299 (diff) | |
| download | otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.gz otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.tar.bz2 otp-6cfa8af60a9c6fe9043e4992434d40d4a34019e3.zip | |
Merge pull request #1854 from jhogberg/john/erts/cross-type-carrier-migration/OTP-15063
Allow carrier migration between different allocator types
Diffstat (limited to 'erts/emulator/test/process_SUITE.erl')
| -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 57eb082d64..f4b1d885fe 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -2233,8 +2233,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. @@ -2242,10 +2242,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, {}), |