diff options
| author | Lukas Larsson <[email protected]> | 2016-05-03 10:07:27 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-03 10:07:27 +0200 |
| commit | 8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5 (patch) | |
| tree | 32c3d1b27c5ee4801958f58b449e8fafae19153f /erts/emulator/test/match_spec_SUITE.erl | |
| parent | 94e70f82df417d9e673a13d101007d7ae8932df7 (diff) | |
| parent | 80512854940a6db33152717246a34bbe68aaa8ed (diff) | |
| download | otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.tar.gz otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.tar.bz2 otp-8fcc73cd8d19fe362f929c9cb0d96579a2ed4ee5.zip | |
Merge branch 'lukas/erts/tracing/misc_fixes/OTP-13503'
* lukas/erts/tracing/misc_fixes/OTP-13503:
erts: Add test for new procs trace with spawn_link
kernel: Remove seq_trace event order dep in tc
erts: Add tests for set on link tracing
erts: Expand trace tests for refc binaries
erts: Remove erl_tracer with invalid state
erts: Remove some dead code
erts: Fix broken doc link to erl_tracer
Conflicts:
erts/emulator/beam/erl_trace.c
Diffstat (limited to 'erts/emulator/test/match_spec_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/match_spec_SUITE.erl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/erts/emulator/test/match_spec_SUITE.erl b/erts/emulator/test/match_spec_SUITE.erl index ea973276db..6733237b20 100644 --- a/erts/emulator/test/match_spec_SUITE.erl +++ b/erts/emulator/test/match_spec_SUITE.erl @@ -597,16 +597,15 @@ ms_trace3(Config) when is_list(Config) -> end), ok. -ms_trace_dead(doc) -> - ["Test that a dead tracer is removed using ms"]; -ms_trace_dead(suite) -> []; -ms_trace_dead(Config) when is_list(Config) -> +%% Test that a dead tracer is removed using ms +ms_trace_dead(_Config) -> Self = self(), TFun = fun F() -> receive M -> Self ! M, F() end end, {Tracer, MRef} = spawn_monitor(TFun), MetaTracer = spawn_link(TFun), erlang:trace_pattern({?MODULE, f1, '_'}, - [{'_',[],[{trace,[], + [{'_',[],[{message, false}, + {trace,[], [call,{const,{tracer,Tracer}}]}]}], [{meta, MetaTracer}]), erlang:trace_pattern({?MODULE, f2, '_'}, []), @@ -623,8 +622,6 @@ ms_trace_dead(Config) when is_list(Config) -> ?MODULE:f2(3,4), TRef = erlang:trace_delivered(all), receive {trace_delivered, _, TRef} -> ok end, - receive {trace_ts, Self, call, {?MODULE, f1, _}, _} -> ok end, - receive {trace_ts, Self, call, {?MODULE, f1, _}, _} -> ok end, receive M -> ct:fail({unexpected, M}) after 10 -> ok end. %% Test that destructive operations in test bif does not really happen |