aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-02-28 14:06:52 +0100
committerBjörn Gustavsson <[email protected]>2016-03-09 13:20:01 +0100
commitd5054f75f5a62bcb6c9b63e01d34d28f0867e21d (patch)
tree7953a203c6df38e7d4060988f7c81e11259efdb8 /lib
parent22785cd1e21600365e71fb0bd2835e5b53de8764 (diff)
downloadotp-d5054f75f5a62bcb6c9b63e01d34d28f0867e21d.tar.gz
otp-d5054f75f5a62bcb6c9b63e01d34d28f0867e21d.tar.bz2
otp-d5054f75f5a62bcb6c9b63e01d34d28f0867e21d.zip
Use 'test_server' instead of ?t macro
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/test/io_proto_SUITE.erl16
-rw-r--r--lib/stdlib/test/qlc_SUITE.erl4
-rw-r--r--lib/stdlib/test/shell_SUITE.erl4
-rw-r--r--lib/stdlib/test/stdlib_SUITE.erl2
4 files changed, 14 insertions, 12 deletions
diff --git a/lib/stdlib/test/io_proto_SUITE.erl b/lib/stdlib/test/io_proto_SUITE.erl
index 82ef855cab..4a009814fa 100644
--- a/lib/stdlib/test/io_proto_SUITE.erl
+++ b/lib/stdlib/test/io_proto_SUITE.erl
@@ -763,7 +763,7 @@ bc_with_r12(suite) ->
bc_with_r12(doc) ->
["Test io protocol compatibility with R12 nodes"];
bc_with_r12(Config) when is_list(Config) ->
- case ?t:is_release_available("r12b") of
+ case test_server:is_release_available("r12b") of
true -> bc_with_r12_1(Config);
false -> {skip,"No R12B found"}
end.
@@ -772,7 +772,8 @@ bc_with_r12_1(Config) ->
PA = filename:dirname(code:which(?MODULE)),
Name1 = io_proto_r12_1,
?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
- ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
+ test_server:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},
+ {erl,[{release,"r12b"}]}]),
DataDir = ?config(data_dir,Config),
%PrivDir = ?config(priv_dir,Config),
FileName1 = filename:join([DataDir,"testdata_latin1.dat"]),
@@ -899,7 +900,7 @@ bc_with_r12_1(Config) ->
?line eof = rpc:call(N1,file,read,[F4,1]),
file:close(F4),
- ?t:stop_node(N1),
+ test_server:stop_node(N1),
ok.
hold_the_line(Parent,Filename,Options) ->
@@ -915,7 +916,7 @@ bc_with_r12_gl(suite) ->
bc_with_r12_gl(doc) ->
["Test io protocol compatibility with R12 nodes (terminals)"];
bc_with_r12_gl(Config) when is_list(Config) ->
- case ?t:is_release_available("r12b") of
+ case test_server:is_release_available("r12b") of
true ->
case get_progs() of
{error,Reason} ->
@@ -932,7 +933,7 @@ bc_with_r12_ogl(suite) ->
bc_with_r12_ogl(doc) ->
["Test io protocol compatibility with R12 nodes (oldshell)"];
bc_with_r12_ogl(Config) when is_list(Config) ->
- case ?t:is_release_available("r12b") of
+ case test_server:is_release_available("r12b") of
true ->
case get_progs() of
{error,Reason} ->
@@ -948,7 +949,8 @@ bc_with_r12_gl_1(_Config,Machine) ->
PA = filename:dirname(code:which(?MODULE)),
Name1 = io_proto_r12_gl_1,
?line N1 = list_to_atom(atom_to_list(Name1) ++ "@" ++ hostname()),
- ?line ?t:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},{erl,[{release,"r12b"}]}]),
+ test_server:start_node(Name1, peer, [{args, "-pz \""++PA++"\""},
+ {erl,[{release,"r12b"}]}]),
TestDataLine1 = [229,228,246],
TestDataLine1BinUtf = unicode:characters_to_binary(TestDataLine1),
TestDataLine1BinLatin = list_to_binary(TestDataLine1),
@@ -1022,7 +1024,7 @@ bc_with_r12_gl_1(_Config,Machine) ->
after 5000 ->
exit(timeout)
end,
- ?t:stop_node(N1),
+ test_server:stop_node(N1),
ok.
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index a886df99e7..a4093a58b1 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1186,7 +1186,7 @@ evaluator(Config) when is_list(Config) ->
evaluator_2(Config, []),
?line {ok, Node} = start_node(qlc_SUITE_evaluator),
?line ok = rpc:call(Node, ?MODULE, evaluator_2, [Config, [compiler]]),
- ?line ?t:stop_node(Node),
+ test_server:stop_node(Node),
ok.
evaluator_2(Config, Apps) ->
@@ -1214,7 +1214,7 @@ evaluator_2(Config, Apps) ->
start_node(Name) ->
?line PA = filename:dirname(code:which(?MODULE)),
- ?t:start_node(Name, slave, [{args, "-pa " ++ PA}]).
+ test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
string_to_handle(doc) ->
"string_to_handle/1,2.";
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index e1733292f6..7cd87f4871 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -608,12 +608,12 @@ otp_5435(Config) when is_list(Config) ->
?line true = is_alive(),
?line {ok, Node} = start_node(shell_SUITE_otp_5435),
?line ok = rpc:call(Node, ?MODULE, otp_5435_2, []),
- ?line ?t:stop_node(Node),
+ test_server:stop_node(Node),
ok.
start_node(Name) ->
?line PA = filename:dirname(code:which(?MODULE)),
- ?t:start_node(Name, slave, [{args, "-pa " ++ PA}]).
+ test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
otp_5435_2() ->
?line true = code:del_path(compiler),
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index c9970f84b2..41176814db 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -59,7 +59,7 @@ app_test(suite) ->
app_test(doc) ->
["Application consistency test."];
app_test(Config) when is_list(Config) ->
- ?t:app_test(stdlib),
+ test_server:app_test(stdlib),
ok.
%% Test that appup allows upgrade from/downgrade to a maximum of one