diff options
| author | Björn-Egil Dahlberg <egil@erlang.org> | 2016-03-08 19:35:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <egil@erlang.org> | 2016-03-11 15:43:10 +0100 |
| commit | c062dfc485ad0d51d648701950f77ef8f51d4f35 (patch) | |
| tree | bc504742a0bdaea8d5cfbe1cd34625b25c78023a /erts/emulator/test/erl_drv_thread_SUITE.erl | |
| parent | 9042f9f26fc42fc108c3e3711cf3bfdae2d3312d (diff) | |
| download | erlang-c062dfc485ad0d51d648701950f77ef8f51d4f35.tar.gz | |
Modernize use of timetraps
Diffstat (limited to 'erts/emulator/test/erl_drv_thread_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/erl_drv_thread_SUITE.erl | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl index 26d00db7c0..a56741adc6 100644 --- a/erts/emulator/test/erl_drv_thread_SUITE.erl +++ b/erts/emulator/test/erl_drv_thread_SUITE.erl @@ -20,8 +20,7 @@ -module(erl_drv_thread_SUITE). -author('rickard.s.green@ericsson.com'). --export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, - init_per_group/2,end_per_group/2]). +-export([all/0, suite/0]). -export([basic/1, rwlock/1, tsd/1]). @@ -34,21 +33,6 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [basic, rwlock, tsd]. -groups() -> - []. - -init_per_suite(Config) -> - Config. - -end_per_suite(_Config) -> - ok. - -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% @@ -97,7 +81,7 @@ drv_case(Config, CaseName, Command, TimeTrap) when is_list(Config), end. run_drv_case(Config, CaseName, Command, TimeTrap) -> - ?line Dog = test_server:timetrap(test_server:seconds(TimeTrap)), + ct:timetrap({seconds, TimeTrap}), ?line DataDir = ?config(data_dir,Config), case erl_ddll:load_driver(DataDir, CaseName) of ok -> ok; @@ -115,7 +99,6 @@ run_drv_case(Config, CaseName, Command, TimeTrap) -> ok end, ?line ok = erl_ddll:unload_driver(CaseName), - ?line test_server:timetrap_cancel(Dog), ?line Result. receive_drv_result(Port, CaseName) -> |