Replace ?t with test_server

The macro ?t is deprecated. Replace its use with 'test_server'.

24 files changed, 50 insertions, 49 deletions

diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 419f92c4a6..b3b0d6d57e 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -99,7 +99,7 @@ migration(Cfg) ->
     end.
 
 erts_mmap(Config) when is_list(Config) ->
-    case ?t:os_type() of
+    case test_server:os_type() of
 	{unix, _} ->
 	    [erts_mmap_do(Config, SCO, SCRPM, SCRFSD)
 	     || SCO <-[true,false], SCRFSD <-[1234,0], SCRPM <- [true,false]];
@@ -162,7 +162,7 @@ drv_case(Config) ->
     drv_case(Config, one_shot, "").
 
 drv_case(Config, Mode, NodeOpts) when is_list(Config) ->
-    case ?t:os_type() of
+    case test_server:os_type() of
 	{Family, _} when Family == unix; Family == win32 ->
 	    ?line {ok, Node} = start_node(Config, NodeOpts),
 	    ?line Self = self(),
@@ -355,11 +355,11 @@ start_node_1(Config, Opts) ->
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) when Node =:= node() -> ok;
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 free_memory() ->
     %% Free memory in MB.
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 576bcd0688..65e2d2fdad 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -1515,7 +1515,7 @@ cmp_old_impl(Config) when is_list(Config) ->
 	false ->
 	    {skipped, "No "++Rel++" available"};
 	true ->
-	    {ok, Node} = ?t:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel),
+	    {ok, Node} = test_server:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel),
 				       peer,
 				       [{args, " -setcookie "++Cookie},
 					{erl, [{release, Rel}]}]),
@@ -1557,7 +1557,7 @@ cmp_old_impl(Config) when is_list(Config) ->
 	    cmp_node(Node, {erlang, bitstring_to_list, [list_to_bitstring(list2bitstrlist(mk_list(1000000)))]}),
 	    cmp_node(Node, {erlang, bitstring_to_list, [list_to_bitstring(list2bitstrlist(mk_list(10000000)))]}),
 
-	    ?t:stop_node(Node),
+	    test_server:stop_node(Node),
 
 	    ok
     end.
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 5f2ecdcbe1..e341d4ab2b 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -1070,7 +1070,7 @@ atom_roundtrip(Config) when is_list(Config) ->
     ?line ok.
 
 atom_roundtrip_r15b(Config) when is_list(Config) ->
-    case ?t:is_release_available("r15b") of
+    case test_server:is_release_available("r15b") of
 	true ->
 	    ?line AtomData = atom_data(),
 	    ?line verify_atom_data(AtomData),
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index 37ad0fd79d..f519634281 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -518,7 +518,7 @@ queue_echo(doc) ->
     ["1) Queue up data in a driver that uses the full driver_queue API to do this."
      "2) Get the data back, a random amount at a time."];
 queue_echo(Config) when is_list(Config) ->
-    case ?t:is_native(?MODULE) of
+    case test_server:is_native(?MODULE) of
 	true -> exit(crashes_native_code);
 	false -> queue_echo_1(Config)
     end.
@@ -2571,10 +2571,10 @@ start_node(Config) when is_list(Config) ->
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, "-pa "++Pa}]).
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 wait_deallocations() ->
     try
diff --git a/erts/emulator/test/erl_drv_thread_SUITE.erl b/erts/emulator/test/erl_drv_thread_SUITE.erl
index 7d5e57eb0c..5c861ae9f0 100644
--- a/erts/emulator/test/erl_drv_thread_SUITE.erl
+++ b/erts/emulator/test/erl_drv_thread_SUITE.erl
@@ -71,7 +71,7 @@ drv_case(Config, CaseName, Command, TimeTrap) when is_list(Config),
 						   is_atom(CaseName),
 						   is_list(Command),
 						   is_integer(TimeTrap) ->
-    case ?t:os_type() of
+    case test_server:os_type() of
 	{Family, _} when Family == unix; Family == win32 ->
 	    ?line run_drv_case(Config, CaseName, Command, TimeTrap);
 	SkipOs ->
diff --git a/erts/emulator/test/erl_link_SUITE.erl b/erts/emulator/test/erl_link_SUITE.erl
index 2a59ca8e99..472232a27d 100644
--- a/erts/emulator/test/erl_link_SUITE.erl
+++ b/erts/emulator/test/erl_link_SUITE.erl
@@ -1038,7 +1038,7 @@ start_node(Name) ->
 
 start_node(Name, Args) ->
     ?line Pa = filename:dirname(code:which(?MODULE)),
-    ?line Res = ?t:start_node(Name, slave, [{args,  Args ++ " -pa " ++ Pa}]),
+    ?line Res = test_server:start_node(Name, slave, [{args,  Args ++ " -pa " ++ Pa}]),
     ?line {ok, Node} = Res,
     ?line rpc:call(Node, erts_debug, set_internal_state,
 		   [available_internal_state, true]),
@@ -1046,7 +1046,7 @@ start_node(Name, Args) ->
     
 
 stop_node(Node) ->
-    ?line ?t:stop_node(Node).
+    ?line test_server:stop_node(Node).
 
 -define(COOKIE, '').
 -define(DOP_LINK,		1).
diff --git a/erts/emulator/test/float_SUITE.erl b/erts/emulator/test/float_SUITE.erl
index 67e14e015e..df44e28e2c 100644
--- a/erts/emulator/test/float_SUITE.erl
+++ b/erts/emulator/test/float_SUITE.erl
@@ -283,10 +283,10 @@ start_node(Config) when is_list(Config) ->
 			      ++ integer_to_list(erlang:system_time(seconds))
 			      ++ "-"
 			      ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa}]).
+    ?line test_server:start_node(Name, slave, [{args, "-pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 %% Test that operations that might hide infinite intermediate results
diff --git a/erts/emulator/test/fun_r13_SUITE.erl b/erts/emulator/test/fun_r13_SUITE.erl
index 3ee7b90686..c8146de46a 100644
--- a/erts/emulator/test/fun_r13_SUITE.erl
+++ b/erts/emulator/test/fun_r13_SUITE.erl
@@ -34,7 +34,7 @@ all() ->
     [dist_old_release].
 
 dist_old_release(Config) when is_list(Config) ->
-    case ?t:is_release_available("r12b") of
+    case test_server:is_release_available("r12b") of
 	true -> do_dist_old(Config);
 	false -> {skip,"No R12B found"}
     end.
@@ -42,7 +42,7 @@ dist_old_release(Config) when is_list(Config) ->
 do_dist_old(Config) when is_list(Config) ->
     ?line Pa = filename:dirname(code:which(?MODULE)),
     Name = fun_dist_r12,
-    ?line {ok,Node} = ?t:start_node(Name, peer,
+    ?line {ok,Node} = test_server:start_node(Name, peer,
 				    [{args,"-pa "++Pa},
 				     {erl,[{release,"r12b"}]}]),
 
@@ -67,6 +67,7 @@ do_dist_old(Config) when is_list(Config) ->
 	      Other ->
 		  ?line ct:fail({bad_message,Other})
 	  end,
+    true = test_server:stop_node(Node),
     ok.
 
 cons(H, T) ->
diff --git a/erts/emulator/test/ignore_cores.erl b/erts/emulator/test/ignore_cores.erl
index 4af5efe834..7373303a39 100644
--- a/erts/emulator/test/ignore_cores.erl
+++ b/erts/emulator/test/ignore_cores.erl
@@ -94,7 +94,7 @@ setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite),
     end,
     ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
     %% cores are dumped in /cores on MacOS X
-    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+    CoresDir = case {test_server:os_type(), filelib:is_dir("/cores")} of
 		   {{unix,darwin}, true} ->
 		       filelib:fold_files("/cores",
 					  "^core.*$",
diff --git a/erts/emulator/test/message_queue_data_SUITE.erl b/erts/emulator/test/message_queue_data_SUITE.erl
index bbf6b7bb2c..12c42d24aa 100644
--- a/erts/emulator/test/message_queue_data_SUITE.erl
+++ b/erts/emulator/test/message_queue_data_SUITE.erl
@@ -207,7 +207,7 @@ start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index b95a59f2da..191dc09670 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -706,7 +706,7 @@ timer_refc(Config) when is_list(Config) ->
 otp_4715(doc) -> [];
 otp_4715(suite) -> [];
 otp_4715(Config) when is_list(Config) ->
-    case ?t:is_release_available("r9b") of
+    case test_server:is_release_available("r9b") of
 	true -> otp_4715_1(Config);
 	false -> {skip,"No R9B found"}
     end.
@@ -717,10 +717,10 @@ otp_4715_1(Config) ->
 	    ?line run_otp_4715(Config);
 	_ ->
 	    ?line Pa = filename:dirname(code:which(?MODULE)),
-	    ?line ?t:run_on_shielded_node(fun () ->
-						  run_otp_4715(Config)
-					  end,
-					  "+R9 -pa " ++ Pa)
+            ?line test_server:run_on_shielded_node(fun () ->
+                                                           run_otp_4715(Config)
+                                                   end,
+                                                   "+R9 -pa " ++ Pa)
     end.
 
 run_otp_4715(Config) when is_list(Config) ->
@@ -741,7 +741,7 @@ pid_wrap(Config) when is_list(Config) -> ?line pp_wrap(pid).
 port_wrap(doc) -> [];
 port_wrap(suite) -> [];
 port_wrap(Config) when is_list(Config) ->
-    ?line case ?t:os_type() of
+    ?line case test_server:os_type() of
 	      {unix, _} ->
 		  ?line pp_wrap(port);
 	      _ ->
diff --git a/erts/emulator/test/old_mod.erl b/erts/emulator/test/old_mod.erl
index e714a75954..03f1ffd67b 100644
--- a/erts/emulator/test/old_mod.erl
+++ b/erts/emulator/test/old_mod.erl
@@ -37,12 +37,12 @@ sort_on_old_node(List) when is_list(List) ->
 				  ++ integer_to_list(X)
 				  ++ integer_to_list(Y)
 				  ++ integer_to_list(Z)),
-    ?line {ok, Node} = ?t:start_node(NodeName,
+    ?line {ok, Node} = test_server:start_node(NodeName,
 				     peer,
 				     [{args, " -pa " ++ Pa},
 				      {erl, [{release, OldVersion++"b_patched"}]}]),
     ?line Ref = make_ref(),
     ?line spawn_link(Node, ?MODULE, sorter, [self(), Ref, List]),
     ?line SortedPids = receive {Ref, SP} -> SP end,
-    ?line true = ?t:stop_node(Node),
+    ?line true = test_server:stop_node(Node),
     ?line SortedPids.
diff --git a/erts/emulator/test/op_SUITE.erl b/erts/emulator/test/op_SUITE.erl
index a12066f9fa..70e0c57827 100644
--- a/erts/emulator/test/op_SUITE.erl
+++ b/erts/emulator/test/op_SUITE.erl
@@ -257,7 +257,7 @@ run_test_module(Cases, GuardsOk) ->
 
     %% Compile, load, and run the generated module.
 
-    Native = case ?t:is_native(?MODULE) of
+    Native = case test_server:is_native(?MODULE) of
 		 true -> [native];
 		 false -> []
 	     end,
diff --git a/erts/emulator/test/port_SUITE.erl b/erts/emulator/test/port_SUITE.erl
index 8a52305414..563b311f5f 100644
--- a/erts/emulator/test/port_SUITE.erl
+++ b/erts/emulator/test/port_SUITE.erl
@@ -1811,7 +1811,7 @@ exit_status_multi_scheduling_block(doc) -> [];
 exit_status_multi_scheduling_block(suite) -> [];
 exit_status_multi_scheduling_block(Config) when is_list(Config) ->
     Repeat = 3,
-    case ?t:os_type() of
+    case test_server:os_type() of
 	      {unix, _} ->
                   ct:timetrap({minutes, 2*Repeat}),
 		  SleepSecs = 6,
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index ff55a0102f..7df7fb516d 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -2500,10 +2500,10 @@ start_node(Config, Args) when is_list(Config) ->
 			      ++ integer_to_list(erlang:system_time(seconds))
 			      ++ "-"
 			      ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+    test_server:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 enable_internal_state() ->
     case catch erts_debug:get_internal_state(available_internal_state) of
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index dbbf1c43ac..31cc37ad4d 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -876,7 +876,7 @@ get_affinity_mask(_Port, _Status, Affinity) ->
     Affinity.
 
 get_affinity_mask() ->
-    case ?t:os_type() of
+    case test_server:os_type() of
 	{unix, linux} ->
 	    case catch open_port({spawn, "taskset -p " ++ os:getpid()},
 				 [exit_status]) of
@@ -2232,10 +2232,10 @@ start_node(Config, Args) when is_list(Config) ->
 			++ integer_to_list(erlang:system_time(seconds))
 			++ "-"
 			++ integer_to_list(erlang:unique_integer([positive]))),
-    ?line ?t:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
+    ?line test_server:start_node(Name, slave, [{args, "-pa "++Pa++" "++Args}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 
 enable_internal_state() ->
diff --git a/erts/emulator/test/signal_SUITE.erl b/erts/emulator/test/signal_SUITE.erl
index 0784b1df36..ac6c96a02c 100644
--- a/erts/emulator/test/signal_SUITE.erl
+++ b/erts/emulator/test/signal_SUITE.erl
@@ -507,10 +507,10 @@ start_node(Config) ->
 			++ "-" ++ integer_to_list(erlang:system_time(seconds))
 			++ "-" ++ integer_to_list(erlang:unique_integer([positive]))),
     Pa = filename:dirname(code:which(?MODULE)),
-    ?t:start_node(Name, slave, [{args,  "-pa " ++ Pa}]).
+    test_server:start_node(Name, slave, [{args,  "-pa " ++ Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
 have_pending_exit() ->
     have_pending_exit(self()).
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
index 9b0db358f1..900dd124c0 100644
--- a/erts/emulator/test/smoke_test_SUITE.erl
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -156,8 +156,8 @@ start_node(Config, Args) when is_list(Config) ->
 	      ++ "-"
 	      ++ integer_to_list(erlang:unique_integer([positive]))),
     Opts = [{args, "-pa "++Pa++" "++Args}],
-    ?t:start_node(Name, slave, Opts).
+    test_server:start_node(Name, slave, Opts).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
 
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index c16e0f7cbe..8279d374ee 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -107,7 +107,7 @@ wall_clock_update1(N) when N > 0 ->
 
     ?line Wc_Diff = T2_wc_time - T1_wc_time,
     ?line io:format("Wall clock diff = ~p; should be  = 1000..1040~n", [Wc_Diff]),
-    case ?t:is_debug() of
+    case test_server:is_debug() of
 	false ->
 	    ?line true = Wc_Diff =< 1040;
 	true ->
@@ -142,7 +142,7 @@ runtime_update(doc) ->
 	"updated difference after running a process that takes all CPU "
 	" power of the Erlang process for a second.";
 runtime_update(Config) when is_list(Config) ->
-    case ?t:is_cover() of
+    case test_server:is_cover() of
 	false ->
 	    ?line process_flag(priority, high),
 	    do_runtime_update(10);
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index a740cf3622..7d66ea5c5b 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -542,7 +542,7 @@ start_node(Config, Envs) when is_list(Config) ->
                         ++ integer_to_list(erlang:system_time(seconds))
                         ++ "-"
                         ++ integer_to_list(erlang:unique_integer([positive]))),
-    ?t:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
+    test_server:start_node(Name, peer, [{args, "-pa "++Pa}, {env, Envs}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).
diff --git a/erts/emulator/test/time_SUITE.erl b/erts/emulator/test/time_SUITE.erl
index cf98247751..cdf79e48d0 100644
--- a/erts/emulator/test/time_SUITE.erl
+++ b/erts/emulator/test/time_SUITE.erl
@@ -448,7 +448,7 @@ microsecs({Mega_Secs, Secs, Microsecs}) ->
 %% calls to erlang:localtime().
 
 now_update(Config) when is_list(Config) ->
-    case ?t:is_debug() of
+    case test_server:is_debug() of
 	false -> ?line now_update1(10);
 	true -> {skip,"Unreliable in DEBUG build"}
     end.
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index 704269bc0f..c04c2e465e 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -669,7 +669,7 @@ start_slave() ->
     ?line Name = atom_to_list(?MODULE)
 	++ "-" ++ integer_to_list(erlang:system_time(seconds))
 	++ "-" ++ integer_to_list(erlang:unique_integer([positive])),
-    {ok, Node} = ?t:start_node(Name, slave, [{args, "-pa " ++ Pa}]),
+    {ok, Node} = test_server:start_node(Name, slave, [{args, "-pa " ++ Pa}]),
     Node.
 
 stop_slave(Node) ->
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index a579fd7b4e..93ba9a6ba3 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -900,12 +900,12 @@ concurrency(_Config) ->
 	      _ <- lists:seq(1, 2*N)],
     OnAndOff = fun() -> concurrency_on_and_off() end,
     Ps1 = [spawn_monitor(OnAndOff)|Ps0],
-    ?t:sleep(1000),
+    timer:sleep(1000),
 
     %% Now spawn off N more processes that turn on off and off
     %% a local trace pattern.
     Ps = [spawn_monitor(OnAndOff) || _ <- lists:seq(1, N)] ++ Ps1,
-    ?t:sleep(1000),
+    timer:sleep(1000),
 
     %% Clean up.
     [exit(Pid, kill) || {Pid,_} <- Ps],
diff --git a/erts/emulator/test/unique_SUITE.erl b/erts/emulator/test/unique_SUITE.erl
index 84e5cf3222..286fa111ee 100644
--- a/erts/emulator/test/unique_SUITE.erl
+++ b/erts/emulator/test/unique_SUITE.erl
@@ -377,7 +377,7 @@ start_node(Config, Opts) when is_list(Config), is_list(Opts) ->
 			      ++ integer_to_list(A)
 			      ++ "-"
 			      ++ integer_to_list(B)),
-    ?line ?t:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
+    ?line test_server:start_node(Name, slave, [{args, Opts++" -pa "++Pa}]).
 
 stop_node(Node) ->
-    ?t:stop_node(Node).
+    test_server:stop_node(Node).