aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-03-25 18:00:40 +0100
committerLukas Larsson <[email protected]>2019-03-25 18:00:40 +0100
commit2e6166dbef6af554e623f8ddc59abc126f50c584 (patch)
tree0088163d400598c7fe06af81e79ef4dcb4453568 /lib/kernel
parentedb8aa4f76981c1f32c9b429f47ce30100126e58 (diff)
parent922fd35583157596559227e0ec9e0163e8c3b9bc (diff)
downloadotp-2e6166dbef6af554e623f8ddc59abc126f50c584.tar.gz
otp-2e6166dbef6af554e623f8ddc59abc126f50c584.tar.bz2
otp-2e6166dbef6af554e623f8ddc59abc126f50c584.zip
Merge branch 'lukas/erts/fragment-dist-messages/OTP-13397/OTP-15610/OTP-15611/OTP-15612/OTP-15613/OTP-15703'
* lukas/erts/fragment-dist-messages/OTP-13397/OTP-15610/OTP-15611/OTP-15612/OTP-15613/OTP-15703: (26 commits) erts: Yield when exiting/free process is suspended by de doc: Fix Design Princ, statem incorrect anchor erts: Include external msg in need of GC erts: Include dist header in return from dist_ctrl_get_data erts: Fix so that exit/down terms stay alive erts: Pending signals can be for free processes erts: Fix faulty assert in reference_table_term etp: Don't crash etp-stack* when c_p->i is null erts: Adjust dist obuf size correctly after hdr fin erts: Fix non-payload dist exit signals erts: Always do trylock on proc locks when crash dumping Fix tests to work better in debug emulator erts: erts_factory_proc_init should not set hole marker erts: Skip heavy process tab tests in debug emu ts: Use same dynlinking logic for all bsd Revert "erts: Always run fds check after each testcase" erts: Always run fds check after each testcase erts: Always stop any testnodes before testcase exits erts: Add crash dumping of EXITING and FREE processes wx: Remove ERL_FLAGS from Makefile erlc command ...
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/code_SUITE.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 99fecbe970..4f0847084f 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -25,8 +25,8 @@
-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([set_path/1, get_path/1, add_path/1, add_paths/1, del_path/1,
replace_path/1, load_file/1, load_abs/1, ensure_loaded/1,
- delete/1, purge/1, purge_many_exits/1, soft_purge/1, is_loaded/1,
- all_loaded/1,
+ delete/1, purge/1, purge_many_exits/0, purge_many_exits/1,
+ soft_purge/1, is_loaded/1, all_loaded/1,
load_binary/1, dir_req/1, object_code/1, set_path_file/1,
upgrade/1,
sticky_dir/1, pa_pz_option/1, add_del_path/1,
@@ -55,7 +55,7 @@
suite() ->
[{ct_hooks,[ts_install_cth]},
- {timetrap,{minutes,5}}].
+ {timetrap,{seconds,30}}].
all() ->
[set_path, get_path, add_path, add_paths, del_path,
@@ -396,6 +396,9 @@ purge(Config) when is_list(Config) ->
process_flag(trap_exit, OldFlag),
ok.
+purge_many_exits() ->
+ [{timetrap, {minutes, 2}}].
+
purge_many_exits(Config) when is_list(Config) ->
OldFlag = process_flag(trap_exit, true),