diff options
| author | Björn Gustavsson <[email protected]> | 2016-03-11 10:05:44 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-03-11 10:05:44 +0100 |
| commit | d369571f10ccc5ebf4548f4dbc74efe649c5e669 (patch) | |
| tree | 30c4344e66d86ef619568e3b193795659d3ba5b0 /lib/kernel/test/multi_load_SUITE.erl | |
| parent | 12e365ce0af0e93d87aee614d33f71a3b6c3bcc8 (diff) | |
| parent | 0ba20cd6d43e277593b59463d2c2959bb6db0957 (diff) | |
| download | otp-d369571f10ccc5ebf4548f4dbc74efe649c5e669.tar.gz otp-d369571f10ccc5ebf4548f4dbc74efe649c5e669.tar.bz2 otp-d369571f10ccc5ebf4548f4dbc74efe649c5e669.zip | |
Merge branch 'bjorn/kernel/modernize-tests'
* bjorn/kernel/modernize-tests:
Remove ?line macros
Fix comments
gen_tcp_misc_SUITE: Use unique node names
Eliminate use of the ?t macro
Eliminate use of doc and suite clauses
Replace use of test_server:capture*/0 with ct:capture*/0
Eliminate use test_server:format()
Eliminate use of test_server:sleep/1
Eliminate use of test_server:fail/0,1
Eliminate use of ?config() macro
Modernize timetraps
disk_log_SUITE: Remove vestiges of VxWorks support
Conflicts:
lib/kernel/test/code_SUITE.erl
Diffstat (limited to 'lib/kernel/test/multi_load_SUITE.erl')
| -rw-r--r-- | lib/kernel/test/multi_load_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kernel/test/multi_load_SUITE.erl b/lib/kernel/test/multi_load_SUITE.erl index fa8877e117..9cba6fc06e 100644 --- a/lib/kernel/test/multi_load_SUITE.erl +++ b/lib/kernel/test/multi_load_SUITE.erl @@ -28,7 +28,9 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("syntax_tools/include/merl.hrl"). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [basic_atomic_load,basic_errors,sticky_dir,on_load_failing, |