diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-26 13:10:05 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-26 13:10:05 +0100 |
| commit | 63fb22fbca8fc9b3ab118b2dc2d8d2514d926903 (patch) | |
| tree | d29a0e0fe4d750f19c48a19568d3f99252ffe09e /lib/compiler/test/core_SUITE.erl | |
| parent | ad847aa2f332230ea33d6a65953c9be1f22af551 (diff) | |
| parent | fc3c64711400be9eae653350213630cb8cb257f9 (diff) | |
| download | otp-63fb22fbca8fc9b3ab118b2dc2d8d2514d926903.tar.gz otp-63fb22fbca8fc9b3ab118b2dc2d8d2514d926903.tar.bz2 otp-63fb22fbca8fc9b3ab118b2dc2d8d2514d926903.zip | |
Merge branch 'bjorn/compiler/modernize-tests'
* bjorn/compiler/modernize-tests:
Remove ?line macros
Replace use of lists:keysearch/3 with lists:keyfind/3
Eliminate use of doc and suite clauses
Replace ?t with test_server
Replace use of test_server:format/2 with io:format/2
Eliminate use of test_server:fail/0,1
Eliminate use of ?config() macro
Modernize use of timetraps
Eliminate useless helper functions
Diffstat (limited to 'lib/compiler/test/core_SUITE.erl')
| -rw-r--r-- | lib/compiler/test/core_SUITE.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl index ddc4c7af5e..22f6443a77 100644 --- a/lib/compiler/test/core_SUITE.erl +++ b/lib/compiler/test/core_SUITE.erl @@ -35,15 +35,14 @@ N(Config) when is_list(Config) -> try_it(N, Config)). init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) -> - Dog = test_server:timetrap(?t:minutes(5)), - [{watchdog,Dog}|Config]. + Config. end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) -> - Dog = ?config(watchdog, Config), - ?t:timetrap_cancel(Dog), ok. -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,5}}]. all() -> test_lib:recompile(?MODULE), @@ -86,7 +85,8 @@ end_per_group(_GroupName, Config) -> try_it(Mod, Conf) -> - Src = filename:join(?config(data_dir, Conf), atom_to_list(Mod)), + Src = filename:join(proplists:get_value(data_dir, Conf), + atom_to_list(Mod)), compile_and_load(Src, []), compile_and_load(Src, [no_copt]). |