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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index b1d709bc75..ee5f868689 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -1,7 +1,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -607,7 +607,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
 	    EncBin = crypto:des3_cbc_encrypt(K1, K2, K3, IVec, Bin2),
 	    case file:write_file(EncryptFileName, EncBin) of
 		ok ->
-		    io:format("~s --(encrypt)--> ~s~n",
+		    io:format("~ts --(encrypt)--> ~ts~n",
 			      [SrcFileName,EncryptFileName]),
 		    ok;
 		{error,Reason} ->
@@ -649,7 +649,7 @@ decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
 			_ ->
 			    case file:write_file(TargetFileName, SrcBin) of
 				ok ->
-				    io:format("~s --(decrypt)--> ~s~n",
+				    io:format("~ts --(decrypt)--> ~ts~n",
 					      [EncryptFileName,TargetFileName]),
 				    ok;
 				{error,Reason} ->
@@ -700,7 +700,7 @@ get_crypt_key_from_file() ->
 	_ ->
 	    case catch string:tokens(binary_to_list(Result), [$\n,$\r]) of
 		[Key] ->
-		    io:format("~nCrypt key file: ~s~n", [FullName]),
+		    io:format("~nCrypt key file: ~ts~n", [FullName]),
 		    Key;
 		_ ->
 		    {error,{bad_crypt_file,FullName}}