diff options
author | Rickard Green <[email protected]> | 2016-12-19 14:29:33 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2016-12-19 14:29:33 +0100 |
commit | c2e497d888456e7720bd3d4123694c444ef9072b (patch) | |
tree | bcfb96d6df06f25f7d9e97094e719a7f85354e69 /erts/emulator/test/call_trace_SUITE.erl | |
parent | 1715b9284643150da0f3ea43df42df1a4a90e144 (diff) | |
parent | 7d475a83abee8a79f8be564e2772dd434780e15f (diff) | |
download | otp-c2e497d888456e7720bd3d4123694c444ef9072b.tar.gz otp-c2e497d888456e7720bd3d4123694c444ef9072b.tar.bz2 otp-c2e497d888456e7720bd3d4123694c444ef9072b.zip |
Merge branch 'rickard/stacktrace-bugs' into maint
OTP-14055
* rickard/stacktrace-bugs:
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
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}}), |