diff options
| author | Siri Hansen <[email protected]> | 2013-02-07 14:38:40 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-02-07 14:38:40 +0100 |
| commit | 3d8ad0032e33c15fca7e0a36817f6004ca488a1d (patch) | |
| tree | 3140328cebb1f19faad43a502f0c50bdf940ec4d /lib/test_server/src/test_server_io.erl | |
| parent | 508c3e6a2405a57685ca012727f9dd329c9b5044 (diff) | |
| parent | dc6996d047f6284ceb58d26240300ddfc98f03ac (diff) | |
| download | otp-3d8ad0032e33c15fca7e0a36817f6004ca488a1d.tar.gz otp-3d8ad0032e33c15fca7e0a36817f6004ca488a1d.tar.bz2 otp-3d8ad0032e33c15fca7e0a36817f6004ca488a1d.zip | |
Merge branch 'siri/ts-and-tp-in-test-logs/OTP-10780'
* siri/ts-and-tp-in-test-logs/OTP-10780:
[test_server] Add error printouts in case writing to test case html log fails
[test_server] Don't write unicode strings to latin1 log files
Diffstat (limited to 'lib/test_server/src/test_server_io.erl')
| -rw-r--r-- | lib/test_server/src/test_server_io.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl index 662ee11515..242c08f765 100644 --- a/lib/test_server/src/test_server_io.erl +++ b/lib/test_server/src/test_server_io.erl @@ -235,7 +235,7 @@ handle_info(kill_group_leaders, #st{gls=Gls,stopping=From}=St) -> gen_server:reply(From, ok), {stop,normal,St}; handle_info(Other, St) -> - io:format("Ignoring: ~tp\n", [Other]), + io:format("Ignoring: ~p\n", [Other]), {noreply,St}. terminate(_, _) -> @@ -261,7 +261,7 @@ do_output(stdout, Str0, #st{job_name=Name}) -> do_output(Tag, Str, #st{fds=Fds}=St) -> case gb_trees:lookup(Tag, Fds) of none -> - S = io_lib:format("\n*** ERROR: ~w, line ~w: No known '~tp' log file\n", + S = io_lib:format("\n*** ERROR: ~w, line ~w: No known '~p' log file\n", [?MODULE,?LINE,Tag]), do_output(stdout, [S,Str], St); {value,Fd} -> @@ -273,7 +273,7 @@ do_output(Tag, Str, #st{fds=Fds}=St) -> end catch _:Error -> S = io_lib:format("\n*** ERROR: ~w, line ~w: Error writing to " - "log file '~tp': ~tp\n", + "log file '~p': ~p\n", [?MODULE,?LINE,Tag,Error]), do_output(stdout, [S,Str], St) end |