diff options
| author | Siri Hansen <[email protected]> | 2013-01-25 18:07:04 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-25 18:07:04 +0100 |
| commit | 22bb6f45c1c6305d494dc73004d81066d64d2183 (patch) | |
| tree | 7bcc885ae80f0db476cbaded8aa9a2b85b7b165e /lib/common_test/src/ct.erl | |
| parent | 3fb4def74a64a63fbb2b28aef6c5920d7db3ad6e (diff) | |
| parent | 7a056d997ca002a99fec6d303b7077294c1d999b (diff) | |
| download | otp-22bb6f45c1c6305d494dc73004d81066d64d2183.tar.gz otp-22bb6f45c1c6305d494dc73004d81066d64d2183.tar.bz2 otp-22bb6f45c1c6305d494dc73004d81066d64d2183.zip | |
Merge branch 'siri/unicode'
* siri/unicode:
[test_server] Don't escape : and @ in test log links
[test_server] Don't create latin1 filenames if filename mode is utf8
[test_server] Ensure correct encoding in header for erl2html2:convert
[common_test] Update common test modules to handle unicode
[ts] Use unicode:characters_to_list/2 instead of binary_to_list/1
[test_server] Add tests for unicode support
[test_server] Write link target with correct encoding in erl2html2
[test_server] Update test_server to handle unicode
Update preloaded init.beam
Make arguments given with -s option to erl aware of file name encoding
OTP-10702
OTP-10783
Diffstat (limited to 'lib/common_test/src/ct.erl')
| -rw-r--r-- | lib/common_test/src/ct.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl index 8eafdff29f..1c7fafc491 100644 --- a/lib/common_test/src/ct.erl +++ b/lib/common_test/src/ct.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2003-2012. All Rights Reserved. +%% Copyright Ericsson AB 2003-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -735,7 +735,7 @@ fail(Format, Args) -> %%% overwrites the string set by this function.</p> comment(Comment) when is_list(Comment) -> Formatted = - case (catch io_lib:format("~s",[Comment])) of + case (catch io_lib:format("~ts",[Comment])) of {'EXIT',_} -> % it's a list not a string io_lib:format("~p",[Comment]); String -> |