aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-06 16:18:11 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-06 16:23:45 +0200
commit7c9936f44c70bdcb965a78fcf525f97846fb32a0 (patch)
tree4499d618566200b42c57accc978fd5de00412835
parent66668a6504fe3d6ed33ce87b1d4c1a76dae1a987 (diff)
downloadotp-7c9936f44c70bdcb965a78fcf525f97846fb32a0.tar.gz
otp-7c9936f44c70bdcb965a78fcf525f97846fb32a0.tar.bz2
otp-7c9936f44c70bdcb965a78fcf525f97846fb32a0.zip
Replace use of test_server:format/2 with io:format/2
-rw-r--r--erts/test/erl_print_SUITE.erl12
-rw-r--r--erts/test/ethread_SUITE.erl8
-rw-r--r--erts/test/install_SUITE.erl16
3 files changed, 18 insertions, 18 deletions
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index a6d287a318..d52caeb9d6 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -165,11 +165,11 @@ chk_display(Term, Expect) when is_list(Expect) ->
Dstr = erts_debug:display(Term),
case Expect ++ io_lib:nl() of
Dstr ->
- ?t:format("Test of \"~p\" succeeded.~n"
+ io:format("Test of \"~p\" succeeded.~n"
" Expected and got: ~s~n",
[Term, io_lib:write_string(Dstr)]);
DoExpect ->
- ?t:format("***~n"
+ io:format("***~n"
"*** Test of \"~p\" failed!~n"
"*** Expected: ~s~n"
"*** Got: ~s~n"
@@ -240,14 +240,14 @@ port_prog_killer(EProc, OSProc) when is_pid(EProc), is_list(OSProc) ->
element(1, Reason)
== timetrap_timeout ->
Cmd = "kill -9 " ++ OSProc,
- ?t:format("Test case timed out. "
+ io:format("Test case timed out. "
"Trying to kill port program.~n"
" Executing: ~p~n", [Cmd]),
case os:cmd(Cmd) of
[] ->
ok;
OsCmdRes ->
- ?t:format(" ~s", [OsCmdRes])
+ io:format(" ~s", [OsCmdRes])
end;
{'DOWN', Ref, _, _, _} ->
%% OSProc is assumed to have terminated by itself
@@ -275,7 +275,7 @@ read_case_data(Port, TestCase) ->
{Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
ct:fail(get_line(Port, Flag, ReasonStart));
{Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
- ?t:format("Port program pid: ~s~n", [PidStr]),
+ io:format("Port program pid: ~s~n", [PidStr]),
CaseProc = self(),
_ = list_to_integer(PidStr), % Sanity check
spawn_opt(fun () ->
@@ -284,7 +284,7 @@ read_case_data(Port, TestCase) ->
[{priority, max}, link]),
read_case_data(Port, TestCase);
{Port, {data, {Flag, LineStart}}} ->
- ?t:format("~s~n", [get_line(Port, Flag, LineStart)]),
+ io:format("~s~n", [get_line(Port, Flag, LineStart)]),
read_case_data(Port, TestCase);
{Port, eof} ->
ct:fail(port_prog_unexpectedly_closed)
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index 1c1a2f3836..fa85ee9b68 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -220,14 +220,14 @@ port_prog_killer(EProc, OSProc) when is_pid(EProc), is_list(OSProc) ->
element(1, Reason)
== timetrap_timeout ->
Cmd = "kill -9 " ++ OSProc,
- ?t:format("Test case timed out. "
+ io:format("Test case timed out. "
"Trying to kill port program.~n"
" Executing: ~p~n", [Cmd]),
case os:cmd(Cmd) of
[] ->
ok;
OsCmdRes ->
- ?t:format(" ~s", [OsCmdRes])
+ io:format(" ~s", [OsCmdRes])
end;
%% OSProc is assumed to have terminated by itself
{'DOWN', Ref, _, _, _} ->
@@ -255,7 +255,7 @@ read_case_data(Port, TestCase) ->
{Port, {data, {Flag, [?FAILED_MARKER | ReasonStart]}}} ->
ct:fail(get_line(Port, Flag, ReasonStart));
{Port, {data, {eol, [?PID_MARKER | PidStr]}}} ->
- ?t:format("Port program pid: ~s~n", [PidStr]),
+ io:format("Port program pid: ~s~n", [PidStr]),
CaseProc = self(),
_ = list_to_integer(PidStr), % Sanity check
spawn_opt(fun () ->
@@ -264,7 +264,7 @@ read_case_data(Port, TestCase) ->
[{priority, max}, link]),
read_case_data(Port, TestCase);
{Port, {data, {Flag, LineStart}}} ->
- ?t:format("~s~n", [get_line(Port, Flag, LineStart)]),
+ io:format("~s~n", [get_line(Port, Flag, LineStart)]),
read_case_data(Port, TestCase);
{Port, eof} ->
ct:fail(port_prog_unexpectedly_closed)
diff --git a/erts/test/install_SUITE.erl b/erts/test/install_SUITE.erl
index cf5a145755..4f244d2476 100644
--- a/erts/test/install_SUITE.erl
+++ b/erts/test/install_SUITE.erl
@@ -539,13 +539,13 @@ bin_no_srcfile(Config) when is_list(Config) ->
%%
expect(X, X) ->
- ?t:format("result: ~p~n", [X]),
- ?t:format("-----------------------------------------------~n", []),
+ io:format("result: ~p~n", [X]),
+ io:format("-----------------------------------------------~n", []),
ok;
expect(X, Y) ->
- ?t:format("expected: ~p~n", [X]),
- ?t:format("got : ~p~n", [Y]),
- ?t:format("-----------------------------------------------~n", []),
+ io:format("expected: ~p~n", [X]),
+ io:format("got : ~p~n", [Y]),
+ io:format("-----------------------------------------------~n", []),
ct:fail({X,Y}).
init_per_suite(Config) ->
@@ -690,7 +690,7 @@ install_bin3(Config,
++ "\" --exec-prefix \"" ++ EXEC_PREFIX
++ "\" --test-file \"" ++ ResFile ++ "\" erl erlc",
- ?t:format("CMD_PRFX = \"~s\"~n"
+ io:format("CMD_PRFX = \"~s\"~n"
"LN_S = \"~s\"~n"
"BINDIR_SYMLINKS = \"~s\"~n"
"exec_prefix = \"~s\"~n"
@@ -701,9 +701,9 @@ install_bin3(Config,
[CMD_PRFX, LN_S, BINDIR_SYMLINKS, EXEC_PREFIX, BINDIR,
ERLANG_BINDIR, EXTRA_PREFIX, DESTDIR]),
- ?t:format("$ ~s~n", [Cmd]),
+ io:format("$ ~s~n", [Cmd]),
CmdOutput = os:cmd(Cmd),
- ?t:format("~s~n", [CmdOutput]),
+ io:format("~s~n", [CmdOutput]),
ChkRes(case file:consult(ResFile) of
{ok, [Res]} -> Res;
Err -> exit({result, Err})