2 files changed, 18 insertions, 10 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.
-
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index c0200ab67c..a00f607fc1 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.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
@@ -29,7 +29,8 @@
 	 specs/1, suites/2,
 	 subst_file/3, subst/2, print_data/1,
 	 make_non_erlang/2,
-	 maybe_atom_to_list/1, progress/4
+	 maybe_atom_to_list/1, progress/4,
+	 b2s/1
 	]).
 
 error(Reason) ->
@@ -155,7 +156,7 @@ suite_order(_) -> 200.
 subst_file(In, Out, Vars) ->
     case file:read_file(In) of
 	{ok, Bin} ->
-	    Subst = subst(binary_to_list(Bin), Vars, []),
+	    Subst = subst(b2s(Bin), Vars, []),
 	    case file:write_file(Out, Subst) of
 		ok ->
 		    ok;
@@ -334,3 +335,11 @@ make_non_erlang_do(DataDir, Variables) ->
     after
 	timer:sleep(100)  %% maybe unnecessary now when we don't do set_cwd anymore
     end.
+
+b2s(Bin) ->
+    unicode:characters_to_list(Bin,default_encoding()).
+
+default_encoding() ->
+    try epp:default_encoding()
+    catch error:undef -> latin1
+    end.