aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-06-03 17:36:40 +0200
committerLukas Larsson <[email protected]>2013-06-03 17:36:40 +0200
commit8bd1897dac5e2774a6fce56de61b169bd7267bbf (patch)
tree79e0f90f0974a503e1742d8709b39b75baa3a581 /lib/kernel
parent2e0edbce734dbc684abbe7d415b4e94603a45846 (diff)
parent6906875260e2b70d3fd405f3eb6eab625814d105 (diff)
downloadotp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.tar.gz
otp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.tar.bz2
otp-8bd1897dac5e2774a6fce56de61b169bd7267bbf.zip
Merge branch 'maint'
* maint: Do not fail if there is no variables file Run iter max ports on a seperate vm with smaller port table Set max ports for slave node Decrease sleep timer
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/gen_tcp_misc_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 6b672004ec..2d5827282f 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -602,7 +602,7 @@ iter_max_socks(Config) when is_list(Config) ->
%% Run on a different node in order to limit the effect if this test fails.
Dir = filename:dirname(code:which(?MODULE)),
{ok,Node} = test_server:start_node(test_iter_max_socks,slave,
- [{args,"-pa " ++ Dir}]),
+ [{args,"+Q 2048 -pa " ++ Dir}]),
L = rpc:call(Node,?MODULE,do_iter_max_socks,[N, initalize]),
test_server:stop_node(Node),