diff options
| author | Lukas Larsson <[email protected]> | 2014-08-06 14:57:18 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-08-06 14:57:18 +0200 |
| commit | f3220cea004a277b477b0f53cc35ab8122a53792 (patch) | |
| tree | 8e8c4a85801f88585d4f5f1af6e972522cc0a810 /erts | |
| parent | 805f5312d9e1e4f9f382de3d30265802d63760ee (diff) | |
| parent | 6e3f09186e0a5e89eb729840f71e2a73684e9b50 (diff) | |
| download | otp-f3220cea004a277b477b0f53cc35ab8122a53792.tar.gz otp-f3220cea004a277b477b0f53cc35ab8122a53792.tar.bz2 otp-f3220cea004a277b477b0f53cc35ab8122a53792.zip | |
Merge branch 'lukas/erts/fd_bind_tc_fix/OTP-12061' into maint
* lukas/erts/fd_bind_tc_fix/OTP-12061:
erts: Fix tc and docs after {fd,FD} bind change
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index c62bc0c454..344bde7c91 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -1062,10 +1062,9 @@ otp_6602(Config) when is_list(Config) -> %% Inet driver use port locking... {ok, S} = gen_udp:open(0), {ok, Fd} = inet:getfd(S), - {ok, Port} = inet:port(S), %% Steal fd (lock checker used to %% trigger here). - {ok, _S2} = gen_udp:open(Port,[{fd,Fd}]), + {ok, _S2} = gen_udp:open(0,[{fd,Fd}]), Parent ! Done end), ?line receive Done -> ok end, |