diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:42:27 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:42:27 +0200 |
| commit | 1ccd23bb49fddec2ac21859e518a1568cd494b93 (patch) | |
| tree | 6f1fe0dad8b7363c6011d6315ba52bef88418400 /erts/emulator/test | |
| parent | 54e5d891203fee38eaa1dcf76d264fb7bac8ef0d (diff) | |
| parent | d7b83a84c5de60ad6a6aa84eb634a36d0a1a88ff (diff) | |
| download | otp-1ccd23bb49fddec2ac21859e518a1568cd494b93.tar.gz otp-1ccd23bb49fddec2ac21859e518a1568cd494b93.tar.bz2 otp-1ccd23bb49fddec2ac21859e518a1568cd494b93.zip | |
Merge branch 'rickard/nosuspend/OTP-11076' into maint
* rickard/nosuspend/OTP-11076:
Only verify not busy for erlang:send(Port, Msg, [nosuspend]) until scheduled
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/busy_port_SUITE.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/test/busy_port_SUITE.erl b/erts/emulator/test/busy_port_SUITE.erl index 2c63296b83..4b4af0babe 100644 --- a/erts/emulator/test/busy_port_SUITE.erl +++ b/erts/emulator/test/busy_port_SUITE.erl @@ -170,6 +170,7 @@ send_3(Config) when is_list(Config) -> ?line {Owner,Slave} = get_slave(), ?line ok = erlang:send(Slave, {Owner,{command,"set busy"}}, [nosuspend]), + receive after 100 -> ok end, % ensure command reached port ?line nosuspend = erlang:send(Slave, {Owner,{command,"busy"}}, [nosuspend]), ?line unlock_slave(), @@ -563,6 +564,7 @@ scheduling_delay_busy_nosuspend(Config) -> {2,{call,[{var,1},open_port]}}, {0,{cast,[{var,1},{command,1,100}]}}, {0,{cast,[{var,1},{busy,2}]}}, + {0,{timer,sleep,[200]}}, % ensure reached port {10,{call,[{var,1},{command,3,[nosuspend]}]}}, {0,{timer,sleep,[200]}}, {0,{erlang,port_command,[{var,2},<<$N>>,[force]]}}, |