diff options
author | Lukas Larsson <[email protected]> | 2019-01-15 16:48:53 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2019-01-15 16:48:53 +0100 |
commit | 298f1c09da0778c895d95f79f170ea447b3774c0 (patch) | |
tree | 24620d1515c3161c6574f130f6a021d02ed79b5c /erts/emulator | |
parent | 337e8a45ef9e8a6cbe91d004d9bb06a8371eb719 (diff) | |
parent | 5558739ec463bf20e8b7e57be9a0351d4f3e3933 (diff) | |
download | otp-298f1c09da0778c895d95f79f170ea447b3774c0.tar.gz otp-298f1c09da0778c895d95f79f170ea447b3774c0.tar.bz2 otp-298f1c09da0778c895d95f79f170ea447b3774c0.zip |
Merge branch 'lukas/erts/spawn_opt_max_heap_tc_fix' into maint
* lukas/erts/spawn_opt_max_heap_tc_fix:
erts: Fix process_SUITE:max_heap tests
Diffstat (limited to 'erts/emulator')
-rw-r--r-- | erts/emulator/test/process_SUITE.erl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index 57eb082d64..b23f77a0b2 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -2104,6 +2104,13 @@ spawn_opt_max_heap_size(_Config) -> error_logger:add_report_handler(?MODULE, self()), + %% flush any prior messages in error_logger + Pid = spawn(fun() -> ok = nok end), + receive + {error, _, {emulator, _, [Pid|_]}} -> + flush() + end, + %% Test that numerical limit works max_heap_size_test(1024, 1024, true, true), @@ -2208,6 +2215,13 @@ receive_unexpected() -> ok end. +flush() -> + receive + _M -> flush() + after 0 -> + ok + end. + %% error_logger report handler proxy init(Pid) -> {ok, Pid}. |