aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-08-06 14:57:27 +0200
committerLukas Larsson <[email protected]>2014-08-06 14:57:27 +0200
commitdcf09f26e33189f3a1ce8d5924d005a2cb7c42df (patch)
treeacc1ba254885c218c8122d19359b6c53915fcc2c /erts
parent9372074ed6637c3b370457a6e38bc8cfa8aff7a8 (diff)
parentf3220cea004a277b477b0f53cc35ab8122a53792 (diff)
downloadotp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.tar.gz
otp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.tar.bz2
otp-dcf09f26e33189f3a1ce8d5924d005a2cb7c42df.zip
Merge branch 'maint'
* maint: erts: Fix tc and docs after {fd,FD} bind change
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/driver_SUITE.erl3
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,