aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/test
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-12-19 14:29:33 +0100
committerRickard Green <[email protected]>2016-12-19 14:29:33 +0100
commitc2e497d888456e7720bd3d4123694c444ef9072b (patch)
treebcfb96d6df06f25f7d9e97094e719a7f85354e69 /lib/stdlib/test
parent1715b9284643150da0f3ea43df42df1a4a90e144 (diff)
parent7d475a83abee8a79f8be564e2772dd434780e15f (diff)
downloadotp-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 'lib/stdlib/test')
-rw-r--r--lib/stdlib/test/shell_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index c409a6949b..80585ca359 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -2325,7 +2325,7 @@ otp_6554(Config) when is_list(Config) ->
"[unproper | list]).">>),
%% Cheating:
"exception error: no function clause matching "
- "erl_eval:do_apply(4)" ++ _ =
+ "shell:apply_fun(4)" ++ _ =
comm_err(<<"erlang:error(function_clause, [4]).">>),
"exception error: no function clause matching "
"lists:reverse(" ++ _ =