aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-08-19 12:23:11 +0200
committerRickard Green <[email protected]>2014-08-22 15:46:31 +0200
commit14e7c8f79847668d815a55f4328f3a86bd527451 (patch)
tree5638e428705a24cc8eefa1d73f54fc015ac0ef46 /erts/emulator
parente8c43908d0634763c8347883ff3e69635263e039 (diff)
downloadotp-14e7c8f79847668d815a55f4328f3a86bd527451.tar.gz
otp-14e7c8f79847668d815a55f4328f3a86bd527451.tar.bz2
otp-14e7c8f79847668d815a55f4328f3a86bd527451.zip
Fix busy_port_SUITE:io_to_busy test-case
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/busy_port_SUITE.erl6
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},