diff options
| author | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-29 16:42:31 +0200 |
| commit | a8e12f7168c14cc765a63a51c838d065412795d7 (patch) | |
| tree | eef42d97fc8cb4d63d939cccc7f3dc9b0cca7511 /erts/emulator/test | |
| parent | 25f37cf6c5739126c72bdab3e9ec4f95e87d7a8b (diff) | |
| parent | 14e7c8f79847668d815a55f4328f3a86bd527451 (diff) | |
| download | otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.gz otp-a8e12f7168c14cc765a63a51c838d065412795d7.tar.bz2 otp-a8e12f7168c14cc765a63a51c838d065412795d7.zip | |
Merge branch 'rickard/runnable-trace-ooo-bug/OTP-12105' into maint
* rickard/runnable-trace-ooo-bug/OTP-12105:
Fix busy_port_SUITE:io_to_busy test-case
Ensure "runnable port" trace messages are not sent out of order
Ensure "runnable proc" trace messages are not sent out of order
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/busy_port_SUITE.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl index 4b4af0babe..2ed5aaa0d0 100644 --- a/erts/emulator/test/busy_port_SUITE.erl +++ b/erts/emulator/test/busy_port_SUITE.erl @@ -98,8 +98,10 @@ generator(0, Writer, _Data) -> %% Calling process_info(Pid, current_function) on a suspended process %% used to crash Beam. - {current_function, {erlang, send, 2}} = - process_info(Writer, current_function), + case process_info(Writer, [status,current_function]) of + [{status,suspended},{current_function,{erlang,send,2}}] -> ok; + [{status,suspended},{current_function,{erlang,bif_return_trap,_}}] -> ok + end, unlock_slave(); generator(N, Writer, Data) -> Writer ! {exec, Data}, |