aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2018-01-16 09:57:54 +0100
committerHans Bolinder <[email protected]>2018-01-16 09:57:54 +0100
commitd0b12578d697e627a61b758c9ba2c2d183ae4631 (patch)
treefbeadcf128fc5a86c76283a79372380dc7536b45 /erts/emulator
parentf359cffc2590848c9ea4ff366d550c1351569479 (diff)
parenta5a0d49a3e9e76ed893920698f7ddbd97601d671 (diff)
downloadotp-d0b12578d697e627a61b758c9ba2c2d183ae4631.tar.gz
otp-d0b12578d697e627a61b758c9ba2c2d183ae4631.tar.bz2
otp-d0b12578d697e627a61b758c9ba2c2d183ae4631.zip
Merge branch 'maint'
* maint: stdlib: Handle Unicode when formatting stacktraces
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/test/code_SUITE.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index fcef070f08..661a2ee6c9 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -951,9 +951,14 @@ erl_544(Config) when is_list(Config) ->
receive Go -> ok end,
Res2 = process_info(Tester, current_stacktrace),
io:format("~p~n", [Res2]),
- {current_stacktrace,
- [{Mod, wait, 2, Info2}|_]} = Res2,
+ {current_stacktrace, Stack} = Res2,
+ [{Mod, wait, 2, Info2}|_] = Stack,
File = proplists:get_value(file, Info2),
+ StackFun = fun(_, _, _) -> false end,
+ FormatFun = fun (Term, _) -> io_lib:format("~tp", [Term]) end,
+ Formated =
+ lib:format_stacktrace(1, Stack, StackFun, FormatFun),
+ true = is_list(Formated),
ok
after
ok = file:set_cwd(CWD)