diff options
| author | Lukas Larsson <[email protected]> | 2019-03-21 10:38:13 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-03-25 16:34:11 +0100 |
| commit | 80beed3bebbdacf8acdb6cc93992c4a473dac492 (patch) | |
| tree | f45b140271026c44d22bc8f75abd61ade64148a0 | |
| parent | c18f95e787125f8be5a5b1731b896f7008a5d5db (diff) | |
| download | otp-80beed3bebbdacf8acdb6cc93992c4a473dac492.tar.gz otp-80beed3bebbdacf8acdb6cc93992c4a473dac492.tar.bz2 otp-80beed3bebbdacf8acdb6cc93992c4a473dac492.zip | |
Fix tests to work better in debug emulator
| -rw-r--r-- | erts/emulator/test/efile_SUITE.erl | 7 | ||||
| -rw-r--r-- | erts/emulator/test/process_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/test/code_SUITE.erl | 9 | ||||
| -rw-r--r-- | lib/observer/test/observer_SUITE.erl | 3 |
4 files changed, 15 insertions, 6 deletions
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl index 7dcf302742..55c5343739 100644 --- a/erts/emulator/test/efile_SUITE.erl +++ b/erts/emulator/test/efile_SUITE.erl @@ -45,7 +45,12 @@ iter_max_files(Config) when is_list(Config) -> iter_max_files_1(Config) -> DataDir = proplists:get_value(data_dir,Config), TestFile = filename:join(DataDir, "existing_file"), - N = 10, + case erlang:system_info(debug_compiled) of + true -> + N = 5; + false -> + N = 10 + end, %% Run on a different node in order to make the test more stable. Dir = filename:dirname(code:which(?MODULE)), {ok,Node} = test_server:start_node(test_iter_max_files,slave, diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl index e009f60860..c698220013 100644 --- a/erts/emulator/test/process_SUITE.erl +++ b/erts/emulator/test/process_SUITE.erl @@ -134,7 +134,7 @@ end_per_group(_GroupName, Config) -> Config. init_per_testcase(Func, Config) - when Func =:= processes_default_tab_test; + when Func =:= processes_default_tab; Func =:= processes_this_tab -> case erlang:system_info(debug_compiled) of true -> 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), diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl index 75336cedcc..7d54bb9b3b 100644 --- a/lib/observer/test/observer_SUITE.erl +++ b/lib/observer/test/observer_SUITE.erl @@ -41,7 +41,8 @@ %% Default timetrap timeout (set in init_per_testcase) -define(default_timeout, ?t:minutes(2)). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> [{timetrap, {minutes, 5}}, + {ct_hooks,[ts_install_cth]}]. all() -> [app_file, appup_file, {group, gui}]. |