Merge branch 'maint'

3 files changed, 45 insertions, 8 deletions

diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index b438da12d0..de8d611efc 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -180,7 +180,7 @@ init_per_testcase(Case, _Config)
        Case =:= kill_mbox_from_erlang ->
     {skip, "Not yet implemented"};
 init_per_testcase(_Case,Config) ->
-    Dog = ?t:timetrap({seconds,10}),
+    Dog = ?t:timetrap({seconds,30}),
     [{watch_dog,Dog}|Config].
 
 end_per_testcase(_Case,Config) ->
@@ -188,6 +188,7 @@ end_per_testcase(_Case,Config) ->
 	undefined -> ok;
 	Pid -> exit(Pid,kill)
     end,
+    jitu:kill_all_jnodes(),
     ?t:timetrap_cancel(?config(watch_dog,Config)),
     ok.
 
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
index 0e1af0ff22..a029c063bc 100644
--- a/lib/jinterface/test/jitu.erl
+++ b/lib/jinterface/test/jitu.erl
@@ -27,7 +27,10 @@
 	 java/4,
 	 java/5,
 	 init_all/1,
-	 finish_all/1]).
+	 finish_all/1,
+	 kill_all_jnodes/0]).
+
+-include("ct.hrl").
 
 %%
 %% Lots of stuff here are originating from java_client_erl_server_SUITE.erl
@@ -51,10 +54,33 @@ java(Java, Dir, Class, Args, Props) ->
 init_all(Config) when is_list(Config) ->
     case find_executable(["java"]) of
 	false -> {skip,"Found no Java VM"};
-	Path -> [{java,Path}|Config]
+	Path ->
+	    Pid = spawn(fun() ->
+				ets:new(jitu_tab,[set,named_table,public]),
+				receive stop -> ets:delete(jitu_tab) end
+			end),
+	    [{java,Path},{tab_proc,Pid}|Config]
     end.
 
-finish_all(Config) -> Config.
+finish_all(Config) ->
+    kill_all_jnodes(),
+    ?config(tab_proc,Config) ! stop,
+    Config.
+
+kill_all_jnodes() ->
+    Jnodes = ets:tab2list(jitu_tab),
+    [begin
+%	 ct:pal("Killing OsPid=~w started with ~p",[OsPid,_Cmd]),
+	 kill_os_process(os:type(),integer_to_list(OsPid))
+     end || {OsPid,_Cmd} <- Jnodes],
+    ets:delete_all_objects(jitu_tab),
+    ok.
+
+kill_os_process({win32,_},OsPid) ->
+    os:cmd("taskkill /PID " ++ OsPid);
+kill_os_process(_,OsPid) ->
+    os:cmd("kill " ++ OsPid).
+
 
 %%
 %% Internal stuff...
@@ -110,6 +136,12 @@ cmd(Cmd) ->
     io:format("cmd: ~s~n", [Cmd]),
     case catch open_port({spawn,Cmd}, PortOpts) of
 	Port when is_port(Port) ->
+	    case erlang:port_info(Port,os_pid) of
+		{os_pid,OsPid} ->
+		    ets:insert(jitu_tab,{OsPid,Cmd});
+		_ ->
+		    ok
+	    end,
 	    Result = cmd_loop(Port, []),
 	    io:format("cmd res: ~w~n", [Result]),
 	    case Result of
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 1145f860fc..9f37b33718 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -104,12 +104,13 @@ end_per_suite(Config) ->
 init_per_testcase(Case, Config) ->
     T = case atom_to_list(Case) of
 	    "unicode"++_ -> 240;
-	    _ -> 30
+	    _ -> 120
 	end,
     WatchDog = test_server:timetrap(test_server:seconds(T)),
     [{watchdog, WatchDog}| Config].
 
 end_per_testcase(_Case, Config) ->
+    jitu:kill_all_jnodes(),
     WatchDog = ?config(watchdog, Config),
     test_server:timetrap_cancel(WatchDog).
 
@@ -694,15 +695,18 @@ run_server(Server, Config, Action, ExtraArgs) ->
     true = register(Name, self()),
     JName = make_name(),
     spawn_link(fun () ->
+		       %% Setting max memory to 256. This is due to
+		       %% echo_server sometimes failing with
+		       %% OutOfMemoryException one some test machines.
 		       ok = jitu:java(?config(java, Config),
 				      ?config(data_dir, Config),
 				      atom_to_list(Server),
 				      [JName,
 				       erlang:get_cookie(),
 				       node(),
-				       Name]++ExtraArgs
-				     ),
-						%,"-DOtpConnection.trace=3"),
+				       Name]++ExtraArgs,
+				      " -Xmx256m"),
+				      %% " -Xmx256m -DOtpConnection.trace=3"),
 		       Name ! {done, JName}
 	       end),
     receive