diff options
author | Björn Gustavsson <[email protected]> | 2016-04-20 15:09:28 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2016-04-20 15:09:28 +0200 |
commit | aee7c8eec5219cd1b29db34748d2b2a60701a0c3 (patch) | |
tree | 5cea140a7fc5ed6b4ecfa5162e34224d4b7d0707 /lib/debugger/test/bug_SUITE.erl | |
parent | 17f8a6871e3503a670bd2d8ee44ead839f914bd8 (diff) | |
parent | 5f91c7307220d629f76ef1a914a480ba2a3d018e (diff) | |
download | otp-aee7c8eec5219cd1b29db34748d2b2a60701a0c3.tar.gz otp-aee7c8eec5219cd1b29db34748d2b2a60701a0c3.tar.bz2 otp-aee7c8eec5219cd1b29db34748d2b2a60701a0c3.zip |
Merge branch 'bjorn/debugger/cuddle-with-tests'
* bjorn/debugger/cuddle-with-tests:
Remove ?line macros
Replace "%" with "%%" at the beginning of a line
Eliminate doc and suite clauses
Eliminate use of the ?t macro
Eliminate use of test_server:format()
Eliminate use of test_server:fail/{0,1}
Use proplists:get_value/2 instead of ?config()
Modernize use of timetraps
int_SUITE: Fix interpretable/1 in a non-installed system
int_SUITE: Fix interpretable/1 on cross-compiled platforms
Diffstat (limited to 'lib/debugger/test/bug_SUITE.erl')
-rw-r--r-- | lib/debugger/test/bug_SUITE.erl | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl index eeb94f5992..ac73672d2a 100644 --- a/lib/debugger/test/bug_SUITE.erl +++ b/lib/debugger/test/bug_SUITE.erl @@ -28,7 +28,9 @@ -export([otp2163/1, otp4845/1]). -suite() -> [{ct_hooks,[ts_install_cth]}]. +suite() -> + [{ct_hooks,[ts_install_cth]}, + {timetrap,{minutes,1}}]. all() -> [{group, ticket_tests}]. @@ -43,54 +45,52 @@ end_per_suite(_Config) -> ok. init_per_group(_GroupName, Config) -> - Config. + Config. end_per_group(_GroupName, Config) -> - Config. + Config. -otp2163(doc) -> ["BIF exit reason"]; -otp2163(suite) -> []; +%% BIF exit reason. otp2163(Config) when is_list(Config) -> - ?line DataDir = ?config(data_dir, Config), + DataDir = proplists:get_value(data_dir, Config), %% First compile and get the expected results: - ?line FileName = filename:join(DataDir, "otp2163"), - ?line {module,otp2163} = code:load_abs(FileName), + FileName = filename:join(DataDir, "otp2163"), + {module,otp2163} = code:load_abs(FileName), - ?line {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()), - ?line {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()), + {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()), + {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()), %% Then interpret, and check if the results are OK. - ?line {module,otp2163} = int:i(FileName), + {module,otp2163} = int:i(FileName), - ?line ok = io:format("Expecting ~p", [ApplyRes]), - ?line {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()), - ?line ok = io:format("Expecting ~p", [ListRes]), - ?line {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()), + ok = io:format("Expecting ~p", [ApplyRes]), + {'EXIT',{badarg,[ApplyRes|_]}} = (catch otp2163:apply_test()), + ok = io:format("Expecting ~p", [ListRes]), + {'EXIT',{badarg,[ListRes|_]}} = (catch otp2163:list_to_atom_test()), ok. -otp4845(doc) -> ["BIF not loading and not bug compatible, OTP-4845 OTP-4859"]; -otp4845(suite) -> []; +%% BIF not loading and not bug compatible, OTP-4845 OTP-4859. otp4845(Config) when is_list(Config) -> - ?line DataDir = ?config(data_dir, Config), + DataDir = proplists:get_value(data_dir, Config), %% First compile and get the expected results: - ?line FileName = filename:join(DataDir, "otp4845"), - ?line {module,otp4845} = code:load_abs(FileName), + FileName = filename:join(DataDir, "otp4845"), + {module,otp4845} = code:load_abs(FileName), - ?line CompiledRes = (catch otp4845:test()), - ?line ok = io:format("Compiled ~p", [CompiledRes]), + CompiledRes = (catch otp4845:test()), + ok = io:format("Compiled ~p", [CompiledRes]), %% Then interpret, and check if the results are OK. - ?line {module,otp4845} = int:i(FileName), + {module,otp4845} = int:i(FileName), - ?line IntRes = (catch otp4845:test()), - ?line ok = io:format("Interpreted ~p", [IntRes]), + IntRes = (catch otp4845:test()), + ok = io:format("Interpreted ~p", [IntRes]), - ?line CompiledRes = IntRes, + CompiledRes = IntRes, ok. |