Merge pull request #5022 from max-au/max-au/cleanup-deprecated-t

test suites: replace ?t: with test_server:, use ct:sleep and ct:fail instead of legacy test_server:sleep and test_server:fail

OTP-17632

5 files changed, 7 insertions, 10 deletions

diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index cbcc596544..d40258b930 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -25,7 +25,6 @@
 -define(format(S, A), io:format(S, A)).
 -define(line, put(line, ?LINE), ).
 -define(config(X,Y), "./log_dir/").
--define(t,test_server).
 -define(privdir, "beam_lib_SUITE_priv").
 -else.
 -include_lib("common_test/include/ct.hrl").
diff --git a/lib/stdlib/test/file_sorter_SUITE.erl b/lib/stdlib/test/file_sorter_SUITE.erl
index 5c0e2c1576..50cdaafe44 100644
--- a/lib/stdlib/test/file_sorter_SUITE.erl
+++ b/lib/stdlib/test/file_sorter_SUITE.erl
@@ -25,7 +25,6 @@
 -define(format(S, A), io:format(S, A)).
 -define(line, put(line, ?LINE), ).
 -define(config(X,Y), foo).
--define(t,test_server).
 -define(privdir(_), "./file_sorter_SUITE_priv").
 -else.
 -include_lib("common_test/include/ct.hrl").
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index d216a8fdf0..b12a8c6a65 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -541,7 +541,7 @@ abnormal1(Config) ->
 	   gen_statem:call(Name, {delayed_answer,2000}, 100),
 	   Reason),
     ok = gen_statem:stop(Name),
-    ?t:sleep(1100),
+    ct:sleep(1100),
     ok = verify_empty_msgq().
 
 %% Check that time outs in calls work
@@ -561,7 +561,7 @@ abnormal1clean(Config) ->
 	     Name, {delayed_answer,1000}, {clean_timeout,10}),
 	   Reason),
     ok = gen_statem:stop(Name),
-    ?t:sleep(1100),
+    ct:sleep(1100),
     ok = verify_empty_msgq().
 
 %% Check that time outs in calls work
@@ -581,7 +581,7 @@ abnormal1dirty(Config) ->
 	     Name, {delayed_answer,1000}, {dirty_timeout,10}),
 	   Reason),
     ok = gen_statem:stop(Name),
-    ?t:sleep(1100),
+    ct:sleep(1100),
     case flush() of
 	[] -> ok
     end.
@@ -2259,7 +2259,7 @@ do_func_test(STM) ->
     ok = do_connect(STM),
     ok = gen_statem:cast(STM, {'alive?',self()}),
     wfor(yes),
-    ?t:do_times(3, ?MODULE, do_msg, [STM]),
+    test_server:do_times(3, ?MODULE, do_msg, [STM]),
     ok = gen_statem:cast(STM, {'alive?',self()}),
     wfor(yes),
     ok = do_disconnect(STM),
@@ -2310,7 +2310,7 @@ do_sync_func_test(STM) ->
     yes = gen_statem:call(STM, 'alive?'),
     ok = do_sync_connect(STM),
     yes = gen_statem:call(STM, 'alive?'),
-    ?t:do_times(3, ?MODULE, do_sync_msg, [STM]),
+    test_server:do_times(3, ?MODULE, do_sync_msg, [STM]),
     yes = gen_statem:call(STM, 'alive?'),
     ok = do_sync_disconnect(STM),
     yes = gen_statem:call(STM, 'alive?'),
@@ -2368,7 +2368,7 @@ init(stop) ->
 init(stop_shutdown) ->
     {stop,shutdown};
 init(sleep) ->
-    ?t:sleep(1000),
+    ct:sleep(1000),
     init_sup({ok,idle,data});
 init(hiber) ->
     init_sup({ok,hiber_idle,[]});
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 3b6e63d82f..5eef8ae48d 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -673,7 +673,7 @@ pcre_compile_workspace_overflow(Config) when is_list(Config) ->
         {error, {"parentheses are too deeply nested (stack check)" = Str, _No}} ->
             {comment, ExpStr ++ Str};
         Other ->
-            ?t:fail({unexpected, Other})
+            ct:fail({unexpected, Other})
     end.
 
 %% Make sure matches that really loop infinitely actually fail.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 494c3e68ef..3736d19af3 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -47,7 +47,6 @@
 
 -ifdef(STANDALONE).
 -define(config(A,B),config(A,B)).
--define(t,test_server).
 -export([config/2]).
 -define(line, noop, ).
 config(priv_dir,_) ->