diff options
| author | Siri Hansen <[email protected]> | 2013-01-23 14:44:21 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-25 15:56:00 +0100 |
| commit | 0df8de4fa21d650b3f2795e3aa6d29952e4b08de (patch) | |
| tree | 94cfb4bf954b1f25029f996f9d4ae6afed8b7296 /lib/common_test/src/ct.erl | |
| parent | 9c262fece1241bd006cd78ce84b63e4924c55325 (diff) | |
| download | otp-0df8de4fa21d650b3f2795e3aa6d29952e4b08de.tar.gz otp-0df8de4fa21d650b3f2795e3aa6d29952e4b08de.tar.bz2 otp-0df8de4fa21d650b3f2795e3aa6d29952e4b08de.zip | |
[common_test] Update common test modules to handle unicode
* Use UTF-8 encoding for all HTML files, except the HTML version of
the test suite generated with erl2html2:convert, which will have the
same encoding as the original test suite (.erl) file.
* Encode link targets in HTML files with
test_server_ctrl:uri_encode/1.
* Use unicode modifier 't' with ~s when appropriate.
* Use unicode:characters_to_list and unicode:characters_to_binary for
conversion between binaries and strings instead of binary_to_list
and list_to_binary.
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 -> |