diff options
| author | Björn Gustavsson <[email protected]> | 2017-06-07 16:43:44 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-06-07 16:43:44 +0200 |
| commit | 2cd892c67dcb8d88e33decc2f92cf4bc776497ad (patch) | |
| tree | e47829ba4dd70af7509c16420e8eab8ecd4bf418 /erts/emulator/test/trace_SUITE.erl | |
| parent | 76137cbf49487e07bfcd72d5789bdfde7ef50a92 (diff) | |
| parent | 46b62dea54a230e46bbadfec7f119ff5ab513e6a (diff) | |
| download | otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.tar.gz otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.tar.bz2 otp-2cd892c67dcb8d88e33decc2f92cf4bc776497ad.zip | |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
Stabilize call_with_huge_message_queue/1
same_time_yielding/1: Avoid failing if there are many schedulers
Remove obsolete old_scheduler_SUITE
Robustify process_SUITE:spawn_opt_max_heap_size/1
Contain damage cause by spawn_opt_max_heap_size failing
Make bulk_send_bigbig/1 purely informational
distribution_SUITE: Refactor bulk_send_bigbig/1
receive_SUITE: Remove ?line macros
Lengthen too short timetraps
Fix process_SUITE:low_prio/1
Diffstat (limited to 'erts/emulator/test/trace_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/trace_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/test/trace_SUITE.erl b/erts/emulator/test/trace_SUITE.erl index 643c2e0472..bd0ea22de9 100644 --- a/erts/emulator/test/trace_SUITE.erl +++ b/erts/emulator/test/trace_SUITE.erl @@ -46,7 +46,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap, {seconds, 5}}]. + {timetrap, {minutes, 1}}]. all() -> [cpu_timestamp, receive_trace, link_receive_call_correlation, @@ -184,10 +184,10 @@ receive_trace(Config) when is_list(Config) -> {'EXIT', Intruder, {badarg, _}} = receive_first(), %% Untrace the process; we should not receive anything. - ?line 1 = erlang:trace(Receiver, false, ['receive']), - ?line Receiver ! {hello, there}, - ?line Receiver ! any_garbage, - ?line receive_nothing(), + 1 = erlang:trace(Receiver, false, ['receive']), + Receiver ! {hello, there}, + Receiver ! any_garbage, + receive_nothing(), %% Verify restrictions in matchspec for 'receive' F3 = fun (Pat) -> {'EXIT', {badarg,_}} = (catch erlang:trace_pattern('receive', Pat, [])) end, |