aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src/ts_make.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-05-23 12:08:46 +0200
committerDan Gudmundsson <[email protected]>2014-01-21 10:56:50 +0100
commit248e2eb0462e5d180b2c35a726aba734ce2c2182 (patch)
tree531f93770950553ff9519ef0b2cb497279d5d285 /lib/test_server/src/ts_make.erl
parenta9468296fce5c2f26b448175ec77660ddbad2c76 (diff)
downloadotp-248e2eb0462e5d180b2c35a726aba734ce2c2182.tar.gz
otp-248e2eb0462e5d180b2c35a726aba734ce2c2182.tar.bz2
otp-248e2eb0462e5d180b2c35a726aba734ce2c2182.zip
test_server: Fix ts write unicode in config files
Diffstat (limited to 'lib/test_server/src/ts_make.erl')
-rw-r--r--lib/test_server/src/ts_make.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl
index f3266f5836..8727f7ebfe 100644
--- a/lib/test_server/src/ts_make.erl
+++ b/lib/test_server/src/ts_make.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
@@ -67,7 +67,7 @@ get_port_data(Port, Last0, Complete0) ->
end.
update_last([C|Rest], Line, true) ->
- io:put_chars(Line),
+ io:put_chars(list_to_binary(Line)), %% Utf-8 list to utf-8 binary
io:nl(),
update_last([C|Rest], [], false);
update_last([$\r|Rest], Result, Complete) ->
@@ -79,7 +79,7 @@ update_last([C|Rest], Result, Complete) ->
update_last([], Result, Complete) ->
{Result, Complete};
update_last(eof, Result, _) ->
- Result.
+ unicode:characters_to_list(list_to_binary(Result)).
run_make_script({win32, _}, Make, Dir, Makefile) ->
{"run_make.bat",