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, 4 insertions, 4 deletions

diff --git a/erts/emulator/test/tuple_SUITE.erl b/erts/emulator/test/tuple_SUITE.erl
index 2c2f93e7ee..d59d7d12d3 100644
--- a/erts/emulator/test/tuple_SUITE.erl
+++ b/erts/emulator/test/tuple_SUITE.erl
@@ -64,7 +64,7 @@ init_per_suite(Config) ->
     [{started_apps, A}|Config].
 
 end_per_suite(Config) ->
-    As = ?config(started_apps, Config),
+    As = proplists:get_value(started_apps, Config),
     lists:foreach(fun (A) -> application:stop(A) end, As),
     Config.
 
@@ -259,7 +259,7 @@ t_make_tuple(Size, Element) ->
     lists:foreach(fun(El) when El =:= Element ->
 			  ok;
 		     (Other) ->
-			  test_server:fail({got, Other, expected, Element})
+			  ct:fail({got, Other, expected, Element})
 		  end, tuple_to_list(Tuple)).
 
 %% Tests the erlang:make_tuple/3 BIF.
@@ -385,14 +385,14 @@ tuple_in_guard(Config) when is_list(Config) ->
 	Tuple1 == {element(1, Tuple2),element(2, Tuple2)} ->
 	    ok;
 	true ->
-	    test_server:fail()
+	    ct:fail("failed")
     end,
     if
 	Tuple2 == {element(1, Tuple2),element(2, Tuple2),
 	    element(3, Tuple2)} ->
 	    ok;
 	true ->
-	    test_server:fail()
+	    ct:fail("failed")
     end,
     ok.