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/system_info_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/system_info_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/system_info_SUITE.erl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl index 21ab6b378a..8ea2d88ec4 100644 --- a/erts/emulator/test/system_info_SUITE.erl +++ b/erts/emulator/test/system_info_SUITE.erl @@ -457,11 +457,16 @@ cmp_memory(MWs, Str) -> %% Total, processes, processes_used, and system will seldom %% give us exactly the same result since the two readings %% aren't taken atomically. + %% + %% Torerance is scaled according to the number of schedulers + %% to match spawn_mem_workers. + + Tolerance = 1.05 + 0.01 * erlang:system_info(schedulers_online), - cmp_memory(total, EM, EDM, 1.05), - cmp_memory(processes, EM, EDM, 1.05), - cmp_memory(processes_used, EM, EDM, 1.05), - cmp_memory(system, EM, EDM, 1.05), + cmp_memory(total, EM, EDM, Tolerance), + cmp_memory(processes, EM, EDM, Tolerance), + cmp_memory(processes_used, EM, EDM, Tolerance), + cmp_memory(system, EM, EDM, Tolerance), ok. |