aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-06-10 15:09:19 +0200
committerSverker Eriksson <[email protected]>2013-06-10 15:09:19 +0200
commite0f24e2e849c0277aa75e59bbc430dfc666e135b (patch)
tree861f3c36bba6547a858de0a90ac73dc2b88bfb6a /erts/emulator/test
parenta60a923d6ad01029494dfad34685983426b75093 (diff)
parent4d268f98716dfab50b5a42d8ed88c4c9b13fb557 (diff)
downloadotp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.tar.gz
otp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.tar.bz2
otp-e0f24e2e849c0277aa75e59bbc430dfc666e135b.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test')
-rw-r--r--erts/emulator/test/port_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 498c98fb31..202a8b7537 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