diff options
| author | Peter Andersson <[email protected]> | 2016-04-06 15:09:14 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-05-02 01:52:59 +0200 |
| commit | ad00652a6552068b31703c9137cb2d9b329b2ebb (patch) | |
| tree | 7e4d5557ff89a7c2c0db329843188b921192e8bc /lib/common_test/src/ct_logs.erl | |
| parent | fea24ae8d37b33e97ef1897d0d3b6cdb2338c051 (diff) | |
| download | otp-ad00652a6552068b31703c9137cb2d9b329b2ebb.tar.gz otp-ad00652a6552068b31703c9137cb2d9b329b2ebb.tar.bz2 otp-ad00652a6552068b31703c9137cb2d9b329b2ebb.zip | |
Fix various log related problems
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index 4920383f39..dff9786724 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -882,7 +882,7 @@ create_io_fun(FromPid, CtLogFd, EscChars) -> {_HdOrFt,S,A} -> {false,S,A}; {S,A} -> {true,S,A} end, - try io_lib:format(Str,Args) of + try io_lib:format(Str, Args) of IoStr when Escapable, EscChars, IoList == [] -> escape_chars(IoStr); IoStr when Escapable, EscChars -> @@ -925,7 +925,12 @@ print_to_log(sync, FromPid, Category, TCGL, Content, EscChars, State) -> if FromPid /= TCGL -> IoFun = create_io_fun(FromPid, CtLogFd, EscChars), IoList = lists:foldl(IoFun, [], Content), - io:format(TCGL,["$tc_html","~ts"], [IoList]); + try io:format(TCGL,["$tc_html","~ts"], [IoList]) of + ok -> ok + catch + _:_ -> + io:format(TCGL,"~ts", [IoList]) + end; true -> unexpected_io(FromPid, Category, ?MAX_IMPORTANCE, Content, CtLogFd, EscChars) @@ -958,7 +963,10 @@ print_to_log(async, FromPid, Category, TCGL, Content, EscChars, State) -> _:terminated -> unexpected_io(FromPid, Category, ?MAX_IMPORTANCE, - Content, CtLogFd, EscChars) + Content, CtLogFd, EscChars); + _:_ -> + io:format(TCGL, "~ts", + [lists:foldl(IoFun,[],Content)]) end; false -> unexpected_io(FromPid, Category, |