diff options
author | Sverker Eriksson <[email protected]> | 2013-06-10 14:55:15 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-06-10 14:55:15 +0200 |
commit | ea638ae461a54ffc5610f5e44bc266dd2e41b2a6 (patch) | |
tree | 63868944e92a289cee4e8b585fe72b649a5db72b /erts/emulator/test | |
parent | 56e08cb2d1faa279961413729e48ef1f3275a575 (diff) | |
parent | aae984904cb79166c94a784cb6d1a4e6bfd3e7d7 (diff) | |
download | otp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.tar.gz otp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.tar.bz2 otp-ea638ae461a54ffc5610f5e44bc266dd2e41b2a6.zip |
Merge branch 'sverk/darwin-unlimited-select' into maint
* sverk/darwin-unlimited-select:
erts: Fix dynamic select for darwin
erts: Refactor unlimited select patch
erts: Fix bug in unlimited fd_set patch
Use _DARWIN_UNLIMITED_SELECT in erl_poll
Diffstat (limited to 'erts/emulator/test')
-rw-r--r-- | erts/emulator/test/port_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl index e467e844b3..ced8b41c4b 100644 --- a/erts/emulator/test/port_SUITE.erl +++ b/erts/emulator/test/port_SUITE.erl @@ -628,7 +628,7 @@ iter_max_ports(Config) when is_list(Config) -> iter_max_ports_test(Config) -> - Dog = test_server:timetrap(test_server:minutes(20)), + Dog = test_server:timetrap(test_server:minutes(30)), PortTest = port_test(Config), Command = lists:concat([PortTest, " -h0 -q"]), Iters = case os:type() of |