diff options
| author | Siri Hansen <[email protected]> | 2013-05-02 07:49:45 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-05-02 07:49:45 +0200 |
| commit | ed1bbb32e7030644e29fea79316b380a658b3605 (patch) | |
| tree | f3f486a83adfa97628bc561cd22576bdb7905316 /lib/jinterface/test/nc_SUITE.erl | |
| parent | 0c5dc8d7a6079706dfdf44d4abc22e756eb12863 (diff) | |
| parent | 1158dcc96c3a6a32a042bd6cc361f1c035e9cca1 (diff) | |
| download | otp-ed1bbb32e7030644e29fea79316b380a658b3605.tar.gz otp-ed1bbb32e7030644e29fea79316b380a658b3605.tar.bz2 otp-ed1bbb32e7030644e29fea79316b380a658b3605.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/jinterface/test/nc_SUITE.erl')
| -rw-r--r-- | lib/jinterface/test/nc_SUITE.erl | 12 |
1 files changed, 8 insertions, 4 deletions
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 |