diff options
| author | Lukas Larsson <[email protected]> | 2018-02-26 17:57:53 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-02-26 17:57:53 +0100 |
| commit | 1a0b238c5389e7f39724d390e2e592638b005c47 (patch) | |
| tree | 015827e3c7a03bd434a4f5e474f50ddb83702053 | |
| parent | 16bbe6153f47005430a59eae901b8f6421fd4ebf (diff) | |
| parent | 8bc23cd3da3c5c80a401bfea0738c007dbd21f85 (diff) | |
| download | otp-1a0b238c5389e7f39724d390e2e592638b005c47.tar.gz otp-1a0b238c5389e7f39724d390e2e592638b005c47.tar.bz2 otp-1a0b238c5389e7f39724d390e2e592638b005c47.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/test/z_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/test/erl_distribution_SUITE.erl | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl index b3d0ba20bc..bb1afecafc 100644 --- a/erts/test/z_SUITE.erl +++ b/erts/test/z_SUITE.erl @@ -40,7 +40,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap, {minutes, 5}}]. + {timetrap, {minutes, 10}}]. all() -> [core_files]. diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl index 073b391288..f6791adf86 100644 --- a/lib/kernel/test/erl_distribution_SUITE.erl +++ b/lib/kernel/test/erl_distribution_SUITE.erl @@ -95,7 +95,11 @@ init_per_group(_GroupName, Config) -> end_per_group(_GroupName, Config) -> Config. - +init_per_testcase(TC, Config) when TC == hostnames; + TC == nodenames -> + file:make_dir("hostnames_nodedir"), + file:write_file("hostnames_nodedir/ignore_core_files",""), + Config; init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) -> Config. @@ -251,7 +255,7 @@ test_node(Name, Illigal) -> end, net_kernel:monitor_nodes(true), BinCommand = unicode:characters_to_binary(Command, utf8), - Prt = open_port({spawn, BinCommand}, [stream]), + Prt = open_port({spawn, BinCommand}, [stream,{cd,"hostnames_nodedir"}]), Node = list_to_atom(Name), receive {nodeup, Node} -> |