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

3 files changed, 14 insertions, 5 deletions

diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 8f7f98f9e3..498c98fb31 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -92,7 +92,7 @@
 	 spawn_driver/1, spawn_executable/1, close_deaf_port/1,
 	 unregister_name/1, parallelism_option/1]).
 
--export([]).
+-export([do_iter_max_ports/2]).
 
 %% Internal exports.
 -export([tps/3]).
@@ -635,9 +635,16 @@ iter_max_ports_test(Config) ->
 		      {win32,_} -> 4;
 		      _ -> 10
 		  end,
-    L = do_iter_max_ports(Iters, Command),
+    %% 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,"+Q 2048 -pa " ++ Dir}]),
+    L = rpc:call(Node,?MODULE,do_iter_max_ports,[Iters, Command]),
+    test_server:stop_node(Node),
+
     io:format("Result: ~p",[L]),
     all_equal(L),
+    all_equal(L),
     test_server:timetrap_cancel(Dog),
     {comment, "Max ports: " ++ integer_to_list(hd(L))}.
 
@@ -670,7 +677,7 @@ close_ports([]) ->
     ok.
 
 open_ports(Name, Settings) ->
-    test_server:sleep(50),
+    test_server:sleep(5),
     case catch open_port(Name, Settings) of
 	P when is_port(P) ->
 	    [P| open_ports(Name, Settings)];
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),
 
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index 9b6e10e7e2..a75cae3c9d 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -103,7 +103,9 @@ pre_init_per_suite(_Suite,Config,State) ->
 	end,
 
 	{add_node_name(Config, State), State}
-    catch Error:Reason ->
+    catch error:{badmatch,{error,enoent}} ->
+	{add_node_name(Config, State), State};
+	  Error:Reason ->
 	    Stack = erlang:get_stacktrace(),
 	    ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
 	    {{fail,{?MODULE,{Error,Reason, Stack}}},State}