aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-02-26 17:57:47 +0100
committerLukas Larsson <[email protected]>2018-02-26 17:57:47 +0100
commit8bc23cd3da3c5c80a401bfea0738c007dbd21f85 (patch)
tree9e0e787be22646fe21726933dc440b70b8bb96b4 /erts
parentefd77366eadb9b3167fbdb0b673bd05ac8133022 (diff)
parent442c8ca0560ca0f1270c6cdea457e2de0333b580 (diff)
downloadotp-8bc23cd3da3c5c80a401bfea0738c007dbd21f85.tar.gz
otp-8bc23cd3da3c5c80a401bfea0738c007dbd21f85.tar.bz2
otp-8bc23cd3da3c5c80a401bfea0738c007dbd21f85.zip
Merge branch 'lukas/kernel/dist_SUITE_corefile_ignore' into maint
* lukas/kernel/dist_SUITE_corefile_ignore: kernel: Ignore cores in erl_distribution_SUITE
Diffstat (limited to 'erts')
-rw-r--r--erts/test/z_SUITE.erl2
1 files changed, 1 insertions, 1 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].