aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-12-19 14:32:56 +0100
committerRickard Green <[email protected]>2016-12-19 14:32:56 +0100
commit410d89601ba3d7ff6fb280d17d28654151a4af7c (patch)
treed0b4079916db035cf84b537bfa31a3d0d399a0df /lib
parent4f4cfe837e8a2d1d68751669c0fb1bc689e30062 (diff)
parentc2e497d888456e7720bd3d4123694c444ef9072b (diff)
downloadotp-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 'lib')
-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 56d81eb1f2..15ccdea284 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -2326,7 +2326,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(" ++ _ =