Merge branch 'egil/modernize-erts-tests'

* egil/modernize-erts-tests:
  Tweak bs_construct_SUITE
  Tweak port_SUITE
  Fix module_info_SUITE
  Fix send_term_SUITE
  Cleaner map_SUITE
  Remove ?line macros
  Eliminate use of doc and suite clauses
  Replace ?t with test_server
  Eliminate use of ?config() macro
  Replace use of test_server:format/2 with io:format/2
  Eliminate use of test_server:fail/0,1
  Modernize use of timetraps

1 files changed, 24 insertions, 51 deletions

diff --git a/erts/emulator/test/a_SUITE.erl b/erts/emulator/test/a_SUITE.erl
index a9bba9548b..5b3a213154 100644
--- a/erts/emulator/test/a_SUITE.erl
+++ b/erts/emulator/test/a_SUITE.erl
@@ -29,66 +29,41 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2, long_timers/1, pollset_size/1]).
+-export([all/0, suite/0,
+	 long_timers/1, pollset_size/1]).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [long_timers, pollset_size].
 
-groups() -> 
-    [].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-long_timers(doc) ->
-    [];
-long_timers(suite) ->
-    [];
 long_timers(Config) when is_list(Config) ->
-    Dir = ?config(data_dir, Config),
-    ?line long_timers_test:start(Dir),
-    ?line {comment,
-	   "Testcase started! This test will run in parallel with the "
-	   "erts testsuite and ends in the z_SUITE:long_timers testcase."}.
+    Dir = proplists:get_value(data_dir, Config),
+    long_timers_test:start(Dir),
+    {comment, "Testcase started! This test will run in parallel with the "
+              "erts testsuite and ends in the z_SUITE:long_timers testcase."}.
 
-pollset_size(doc) ->
-    [];
-pollset_size(suite) ->
-    [];
 pollset_size(Config) when is_list(Config) ->
     %% Ensure inet_gethost_native port program started, in order to
     %% allow other suites to use it...
     inet_gethost_native:gethostbyname("localhost"),
-    ?line Parent = self(),
-    ?line Go = make_ref(),
-    ?line spawn(fun () ->
-			Name = pollset_size_testcase_initial_state_holder,
-			true = register(Name, self()),
-			ChkIo = get_check_io_info(),
-			io:format("Initial: ~p~n", [ChkIo]),
-			Parent ! Go,
-			receive
-			    {get_initial_check_io_result, Pid} ->
-				Pid ! {initial_check_io_result, ChkIo}
-			end
-		end),
-    ?line receive Go -> ok end,
-    ?line {comment,
-	   "Testcase started! This test will run in parallel with the "
-	   "erts testsuite and ends in the z_SUITE:pollset_size testcase."}.
+    Parent = self(),
+    Go = make_ref(),
+    spawn(fun () ->
+                  Name = pollset_size_testcase_initial_state_holder,
+                  true = register(Name, self()),
+                  ChkIo = get_check_io_info(),
+                  io:format("Initial: ~p~n", [ChkIo]),
+                  Parent ! Go,
+                  receive
+                      {get_initial_check_io_result, Pid} ->
+                          Pid ! {initial_check_io_result, ChkIo}
+                  end
+          end),
+    receive Go -> ok end,
+    {comment, "Testcase started! This test will run in parallel with the "
+              "erts testsuite and ends in the z_SUITE:pollset_size testcase."}.
 
 %%
 %% Internal functions...
@@ -106,5 +81,3 @@ display_check_io(ChkIo) ->
 
 get_check_io_info() ->
     z_SUITE:get_check_io_info().
-
-