diff options
| author | Björn Gustavsson <[email protected]> | 2012-06-28 11:33:10 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-06-28 11:33:10 +0200 |
| commit | 65c23210b49d348954a6f7f6c70d02f79676ffeb (patch) | |
| tree | b580ad9099457f495f1ffaadac94e9190f87eb4d /erts/emulator/test/call_trace_SUITE.erl | |
| parent | 2af66d1761c54e0bc2811a2ad2950f62d9ceccdc (diff) | |
| parent | 00d769bf3d35df706dbbb9155052183db3631475 (diff) | |
| download | otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.tar.gz otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.tar.bz2 otp-65c23210b49d348954a6f7f6c70d02f79676ffeb.zip | |
Merge branch 'bjorn/erts/breakpoints/OTP-10122'
* bjorn/erts/breakpoints/OTP-10122:
Strengthen trace test cases
Don't go to single-scheduler mode when managing breakpoints
Refactor the code for managing breakpoints
Change the data structures for breakpoints
Add trace_local_SUITE:concurrency/1
Make the lock check in erts_is_code_ix_locked() stronger
Diffstat (limited to 'erts/emulator/test/call_trace_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/call_trace_SUITE.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl index a642c3a63a..eaecd32f95 100644 --- a/erts/emulator/test/call_trace_SUITE.erl +++ b/erts/emulator/test/call_trace_SUITE.erl @@ -78,7 +78,13 @@ init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) -> end_per_testcase(_Func, Config) -> Dog = ?config(watchdog, Config), - ?t:timetrap_cancel(Dog). + ?t:timetrap_cancel(Dog), + + %% Reloading the module will clear all trace patterns, and + %% in a debug-compiled emulator run assertions of the counters + %% for the number of traced exported functions in this module. + + c:l(?MODULE). hipe(Config) when is_list(Config) -> ?line 0 = erlang:trace_pattern({?MODULE,worker_foo,1}, true), @@ -187,7 +193,12 @@ basic() -> %% Trace some functions... ?line trace_func({lists,'_','_'}, []), + + %% Make sure that tracing the same functions more than once + %% does not cause any problems. ?line 3 = trace_func({?MODULE,foo,'_'}, true), + ?line 3 = trace_func({?MODULE,foo,'_'}, true), + ?line 1 = trace_func({?MODULE,bar,0}, true), ?line 1 = trace_func({?MODULE,bar,0}, true), ?line {traced,global} = trace_info({?MODULE,bar,0}, traced), ?line 1 = trace_func({erlang,list_to_integer,1}, true), |