diff options
| author | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-27 09:34:25 +0200 |
| commit | 3f2eea83dd133c597580d7c2b5056bc90219d025 (patch) | |
| tree | f46ad339fc2b21f3bd0c1260b06e218ebd4550fb /lib/runtime_tools/test/dbg_SUITE.erl | |
| parent | ea8064b1bbda0ef59420ec8a805f3ee52630d704 (diff) | |
| parent | d9e0f376b36baa5453717606f373daa5b7a1b0aa (diff) | |
| download | otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.gz otp-3f2eea83dd133c597580d7c2b5056bc90219d025.tar.bz2 otp-3f2eea83dd133c597580d7c2b5056bc90219d025.zip | |
Merge branch 'lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267'
* lukas/erts/tracing/tracer-move-extra-to-map/OTP-10267:
runtime_tools: Fix erl_tracer testcases
runtime_tools: Fix documentation for dbg:p
erts: Move tracer SecondTraceTerm to Opts map
Diffstat (limited to 'lib/runtime_tools/test/dbg_SUITE.erl')
| -rw-r--r-- | lib/runtime_tools/test/dbg_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl index 5a3c885571..4b0864858c 100644 --- a/lib/runtime_tools/test/dbg_SUITE.erl +++ b/lib/runtime_tools/test/dbg_SUITE.erl @@ -30,7 +30,7 @@ erl_tracer/1, distributed_erl_tracer/1]). -export([tracee1/1, tracee2/1]). -export([dummy/0, exported/1]). --export([enabled/3, trace/6, load_nif/1]). +-export([enabled/3, trace/5, load_nif/1]). -include_lib("common_test/include/ct.hrl"). @@ -961,7 +961,7 @@ erl_tracer(Config) -> {ok, _} = dbg:p(self(), [c, timestamp]), {ok, _} = dbg:tp(?MODULE, dummy, []), ok = ?MODULE:dummy(), - [{Self, call, Self, Self, {?MODULE, dummy, []}, undefined, #{}}] = flush(), + [{Self, call, Self, Self, {?MODULE, dummy, []}, #{}}] = flush(), ok. %% Test that distributed erl_tracer modules work @@ -997,10 +997,10 @@ distributed_erl_tracer(Config) -> {ok, {?MODULE, RNifProxy}} = dbg:get_tracer(RNode), LCall = spawn_link(LNode, fun() -> ?MODULE:dummy() end), - [{LCall, call, LNifProxy, LCall, {?MODULE, dummy, []}, undefined, #{}}] = flush(), + [{LCall, call, LNifProxy, LCall, {?MODULE, dummy, []}, #{}}] = flush(), RCall = spawn_link(RNode, fun() -> ?MODULE:dummy() end), - [{RCall, call, RNifProxy, RCall, {?MODULE, dummy, []}, undefined, #{}}] = flush(), + [{RCall, call, RNifProxy, RCall, {?MODULE, dummy, []}, #{}}] = flush(), ok. @@ -1018,7 +1018,7 @@ load_nif(Config) -> enabled(_, _, _) -> erlang:nif_error(nif_not_loaded). -trace(_, _, _, _, _, _) -> +trace(_, _, _, _, _) -> erlang:nif_error(nif_not_loaded). %% |