diff options
| author | Rickard Green <[email protected]> | 2014-08-29 16:43:31 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-08-29 16:43:31 +0200 |
| commit | aa48f2055c6d4002d631664b3a1ebdfe3415680e (patch) | |
| tree | 06f4362bad16a1308ffb540173aadc47811cf73e /erts/emulator/test | |
| parent | d0bc17831c47144eccf94c4ffa09359ba7e0e3d2 (diff) | |
| parent | a8e12f7168c14cc765a63a51c838d065412795d7 (diff) | |
| download | otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.tar.gz otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.tar.bz2 otp-aa48f2055c6d4002d631664b3a1ebdfe3415680e.zip | |
Merge branch 'maint'
* maint:
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}, |