diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-22 10:10:44 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-22 10:10:44 +0100 |
| commit | d203887853971d58a4054400a88f91bbf73b19c8 (patch) | |
| tree | 7b442151bd7b6f37119096913d90f72437db0510 /lib/test_server/src/ts_make.erl | |
| parent | 1f7e86af8b3f489253c06b2043440c11168a4654 (diff) | |
| parent | c0d320e028ce4a4b6af99ad5e20dee8ea95d6fce (diff) | |
| download | otp-d203887853971d58a4054400a88f91bbf73b19c8.tar.gz otp-d203887853971d58a4054400a88f91bbf73b19c8.tar.bz2 otp-d203887853971d58a4054400a88f91bbf73b19c8.zip | |
Merge branch 'dgud/test_unicode/OTP-10877'
* dgud/test_unicode/OTP-10877:
sasl test: Quote executable paths (can contain spaces)
rt_tools: Handle unicode chars in printouts
kernel: code_SUITE fix unicode option
Fix (unicode) debug info in test cases
stdlib: Fix format if module resides in a unicode directory
Fix testing with unicode paths
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.erl | 6 |
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", |