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, 6 insertions, 7 deletions

diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index ba8952f10f..e9e559df5d 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -93,7 +93,7 @@ autoconf1(_,_) ->
     throw(cross_installation_failed).
 
 autoconf2({ok, Bin}) ->
-    get_vars(binary_to_list(Bin), name, [], []);
+    get_vars(ts_lib:b2s(Bin), name, [], []);
 autoconf2(Error) ->
     Error.
 
@@ -170,12 +170,12 @@ parse_xcomp_file(Filepath) ->
 parse_xcomp_file([<<A:8,_/binary>> = Line|R],Envs,Flags)
   when $A =< A, A =< $Z ->
     [Var,Value] = binary:split(Line,<<"=">>),
-    parse_xcomp_file(R,[{binary_to_list(Var),
-			 binary_to_list(Value)}|Envs],Flags);
+    parse_xcomp_file(R,[{ts_lib:b2s(Var),
+			 ts_lib:b2s(Value)}|Envs],Flags);
 parse_xcomp_file([<<"erl_xcomp_",Line/binary>>|R],Envs,Flags) ->
     [Var,Value] = binary:split(Line,<<"=">>),
-    parse_xcomp_file(R,Envs,[{binary_to_list(Var),
-			      binary_to_list(Value)}|Flags]);
+    parse_xcomp_file(R,Envs,[{ts_lib:b2s(Var),
+			      ts_lib:b2s(Value)}|Flags]);
 parse_xcomp_file([_|R],Envs,Flags) ->
     parse_xcomp_file(R,Envs,Flags);
 parse_xcomp_file([],Envs,Flags) ->
@@ -407,4 +407,3 @@ extra_platform_label() ->
 	[_|_]=Label -> "/" ++ Label;
 	false -> ""
     end.
-