aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-01-22 10:51:02 +0100
committerLukas Larsson <[email protected]>2018-01-24 11:47:48 +0100
commit442c8ca0560ca0f1270c6cdea457e2de0333b580 (patch)
tree30007dc730ad6e06fe8f5461eb74e6df43b26ab2
parent919b6ddc24e409ec78380af14511ad50a88b4525 (diff)
downloadotp-442c8ca0560ca0f1270c6cdea457e2de0333b580.tar.gz
otp-442c8ca0560ca0f1270c6cdea457e2de0333b580.tar.bz2
otp-442c8ca0560ca0f1270c6cdea457e2de0333b580.zip
kernel: Ignore cores in erl_distribution_SUITE
Some bash versions segfault when a unicode argument is given so we ignore cores created by nodes spawned by this testcase.
-rw-r--r--erts/test/z_SUITE.erl2
-rw-r--r--lib/kernel/test/erl_distribution_SUITE.erl8
2 files changed, 7 insertions, 3 deletions
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 229a47e1aa..ed42ea5b40 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 bbfaa9d147..e34b4d77d2 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} ->