diff options
author | Rickard Green <[email protected]> | 2016-12-19 14:32:56 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-12-19 14:32:56 +0100 |
commit | 410d89601ba3d7ff6fb280d17d28654151a4af7c (patch) | |
tree | d0b4079916db035cf84b537bfa31a3d0d399a0df /erts/emulator/test/call_trace_SUITE.erl | |
parent | 4f4cfe837e8a2d1d68751669c0fb1bc689e30062 (diff) | |
parent | c2e497d888456e7720bd3d4123694c444ef9072b (diff) | |
download | otp-410d89601ba3d7ff6fb280d17d28654151a4af7c.tar.gz otp-410d89601ba3d7ff6fb280d17d28654151a4af7c.tar.bz2 otp-410d89601ba3d7ff6fb280d17d28654151a4af7c.zip |
Merge branch 'maint'
* maint:
Remove faulty release note for these fixes
New test cases testing stacktrace from apply on erlang:error()
Fix stactrace for apply on error/[1,2], exit/1, or throw/1
Fix stack-trace generated by a traced process
Conflicts:
erts/emulator/beam/beam_emu.c
erts/etc/unix/etp-commands.in
Diffstat (limited to 'erts/emulator/test/call_trace_SUITE.erl')
-rw-r--r-- | erts/emulator/test/call_trace_SUITE.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl index 6ba6301c7c..f7ff04430a 100644 --- a/erts/emulator/test/call_trace_SUITE.erl +++ b/erts/emulator/test/call_trace_SUITE.erl @@ -1090,8 +1090,7 @@ exception_nocatch() -> {trace,t2,exception_from,{erlang,throw,1}, {error,{nocatch,Q2}}}], exception_from, {error,{nocatch,Q2}}), - expect({trace,T2,exit,{{nocatch,Q2},[{erlang,throw,[Q2],[]}, - {?MODULE,deep_4,1, + expect({trace,T2,exit,{{nocatch,Q2},[{?MODULE,deep_4,1, Deep4LocThrow}]}}), Q3 = {dump,[dump,{dump}]}, T3 = @@ -1100,8 +1099,7 @@ exception_nocatch() -> {trace,t3,exception_from,{erlang,error,1}, {error,Q3}}], exception_from, {error,Q3}), - expect({trace,T3,exit,{Q3,[{erlang,error,[Q3],[]}, - {?MODULE,deep_4,1,Deep4LocError}]}}), + expect({trace,T3,exit,{Q3,[{?MODULE,deep_4,1,Deep4LocError}]}}), T4 = exception_nocatch(?LINE, '=', [17,4711], 5, [], exception_from, {error,{badmatch,4711}}), |