Eliminate suite and doc clauses

11 files changed, 9 insertions, 111 deletions

diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index 1565eb0579..a760f0c802 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -76,7 +76,6 @@ end_per_testcase(_RC, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_long(suite) -> [];
 test_ei_decode_long(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_long),
     send_integers(P),
@@ -86,7 +85,6 @@ test_ei_decode_long(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_ulong(suite) -> [];
 test_ei_decode_ulong(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_ulong),
     send_integers(P),
@@ -100,7 +98,6 @@ test_ei_decode_ulong(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_longlong(suite) -> [];
 test_ei_decode_longlong(Config) when is_list(Config) ->
     case os:type() of
         vxworks ->
@@ -115,7 +112,6 @@ test_ei_decode_longlong(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_ulonglong(suite) -> [];
 test_ei_decode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
         vxworks ->
@@ -133,7 +129,6 @@ test_ei_decode_ulonglong(Config) when is_list(Config) ->
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_decode_char(suite) -> [];
 test_ei_decode_char(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_char),
 
@@ -149,7 +144,6 @@ test_ei_decode_char(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_nonoptimal(suite) -> [];
 test_ei_decode_nonoptimal(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_nonoptimal),
 
@@ -199,7 +193,6 @@ send_non_optimal_neg(P) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_misc(suite) -> [];
 test_ei_decode_misc(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_misc),
 
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 7121d4e027..a96b7ed04b 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -60,7 +60,6 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_decode_encode(suite) -> [];
 test_ei_decode_encode(Config) when is_list(Config) ->
     P = runner:start(?test_ei_decode_encode),
 
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index d5520b84fa..2f0e08d13c 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -72,7 +72,6 @@ end_per_group(_GroupName, Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_long(suite) -> [];
 test_ei_encode_long(Config) when is_list(Config) ->
     P = runner:start(?test_ei_encode_long),
 
@@ -95,7 +94,6 @@ test_ei_encode_long(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_ulong(suite) -> [];
 test_ei_encode_ulong(Config) when is_list(Config) ->
     P = runner:start(?test_ei_encode_ulong),
 
@@ -116,7 +114,6 @@ test_ei_encode_ulong(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_longlong(suite) -> [];
 test_ei_encode_longlong(Config) when is_list(Config) ->
     case os:type() of
         vxworks ->
@@ -148,7 +145,6 @@ test_ei_encode_longlong(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_ulonglong(suite) -> [];
 test_ei_encode_ulonglong(Config) when is_list(Config) ->
     case os:type() of
         vxworks ->
@@ -179,7 +175,6 @@ test_ei_encode_ulonglong(Config) when is_list(Config) ->
 %% it is unsigned.
 %% FIXME maybe the API should change to use "unsigned char" to be clear?!
 
-test_ei_encode_char(suite) -> [];
 test_ei_encode_char(Config) when is_list(Config) ->
     P = runner:start(?test_ei_encode_char),
 
@@ -193,7 +188,6 @@ test_ei_encode_char(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_misc(suite) -> [];
 test_ei_encode_misc(Config) when is_list(Config) ->
     P = runner:start(?test_ei_encode_misc),
 
@@ -240,7 +234,6 @@ test_ei_encode_misc(Config) when is_list(Config) ->
 
 %% ######################################################################## %%
 
-test_ei_encode_fails(suite) -> [];
 test_ei_encode_fails(Config) when is_list(Config) ->
     P = runner:start(?test_ei_encode_fails),
 
diff --git a/lib/erl_interface/test/ei_format_SUITE.erl b/lib/erl_interface/test/ei_format_SUITE.erl
index d9b311ed59..d6eea52527 100644
--- a/lib/erl_interface/test/ei_format_SUITE.erl
+++ b/lib/erl_interface/test/ei_format_SUITE.erl
@@ -60,7 +60,6 @@ end_per_group(_GroupName, Config) ->
 
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
     P = runner:start(?atoms),
 
@@ -101,7 +100,6 @@ atoms(Config) when is_list(Config) ->
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
     P = runner:start(?tuples),
 
@@ -123,7 +121,6 @@ tuples(Config) when is_list(Config) ->
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
     P = runner:start(?lists),
 
@@ -165,7 +162,6 @@ lists(Config) when is_list(Config) ->
     ok.
 
 
-format_wo_ver(suite) -> [];
 format_wo_ver(Config) when is_list(Config) ->
     P = runner:start(?format_wo_ver),
 
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index c5f4a928dc..6280883228 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -56,7 +56,6 @@ end_per_group(_GroupName, Config) ->
 
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
     P = runner:start(?atoms),
 
@@ -95,7 +94,6 @@ atoms(Config) when is_list(Config) ->
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
     P = runner:start(?tuples),
 
@@ -117,7 +115,6 @@ tuples(Config) when is_list(Config) ->
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
     P = runner:start(?lists),
 
@@ -143,7 +140,6 @@ lists(Config) when is_list(Config) ->
     runner:recv_eot(P),
     ok.
 
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
     P = runner:start(?strings),
 
diff --git a/lib/erl_interface/test/ei_tmo_SUITE.erl b/lib/erl_interface/test/ei_tmo_SUITE.erl
index 995a407fa2..3d95528093 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE.erl
+++ b/lib/erl_interface/test/ei_tmo_SUITE.erl
@@ -52,10 +52,7 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-framework_check(doc) ->
-    ["Check the framework."];
-framework_check(suite) ->
-    [];
+%% Check the framework.
 framework_check(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
@@ -66,10 +63,7 @@ framework_check(Config) when is_list(Config) ->
     ok.
 
 
-ei_recv_tmo(doc) ->
-    ["Check recv with timeouts."];
-ei_recv_tmo(suite) ->
-    [];
+%% Check recv with timeouts.
 ei_recv_tmo(Config) when is_list(Config) ->
     do_one_recv(Config,c_node_recv_tmo_1),
     do_one_recv_failure(Config,c_node_recv_tmo_2),
@@ -102,10 +96,7 @@ do_one_recv_failure(Config,CNode) ->
     runner:recv_eot(P1).
 
 
-ei_send_tmo(doc) ->
-    ["Check send with timeouts."];
-ei_send_tmo(suite) ->
-    [];
+%% Check send with timeouts.
 ei_send_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
@@ -204,10 +195,7 @@ do_one_send_failure(Config,From,FakeName,CName,VxSim) ->
     ok.
 
 
-ei_connect_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_connect_tmo(suite) ->
-    [];
+%% Check accept with timeouts.
 ei_connect_tmo(Config) when is_list(Config) ->
     %dbg:tracer(),
     %dbg:p(self()),
@@ -274,10 +262,7 @@ ei_connect_tmo(Config) when is_list(Config) ->
     ok.
 
 
-ei_accept_tmo(doc) ->
-    ["Check accept with timeouts."];
-ei_accept_tmo(suite) ->
-    [];
+%% Check accept with timeouts.
 ei_accept_tmo(Config) when is_list(Config) ->
     %%dbg:tracer(),
     %%dbg:p(self()),
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 8595afd224..9472ba2a1c 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -119,7 +119,6 @@ end_per_group(_GroupName, Config) ->
 %% This test asks the C function to construct all data types in
 %% a list and verifies that the result is as expected.
 
-build_terms(suite) -> [];
 build_terms(Config) when is_list(Config) ->
     P = runner:start(?build_terms),
     {term, Term} = get_term(P),
@@ -152,7 +151,6 @@ build_terms(Config) when is_list(Config) ->
 
 %% This test is run entirely in C code.
 
-round_trip_conversion(suite) -> [];
 round_trip_conversion(Config) when is_list(Config) ->
     runner:test(?round_trip_conversion),
     ok.
@@ -160,7 +158,6 @@ round_trip_conversion(Config) when is_list(Config) ->
 %% This test sends a list of all data types to the C code function,
 %% which decodes it and verifies it.
 
-decode_terms(suite) -> [];
 decode_terms(Config) when is_list(Config) ->
     Dummy1 = list_to_atom(filename:join(proplists:get_value(priv_dir, Config),
                                         dummy_file1)),
@@ -183,7 +180,6 @@ decode_terms(Config) when is_list(Config) ->
 
 %% Decodes the floating point number 3.1415.
 
-decode_float(suite) -> [];
 decode_float(Config) when is_list(Config) ->
     P = runner:start(?decode_float),
     runner:send_term(P, 3.1415),
@@ -192,7 +188,6 @@ decode_float(Config) when is_list(Config) ->
 
 %% Tests the erl_free_compound() function.
 
-t_erl_free_compound(suite) -> [];
 t_erl_free_compound(Config) when is_list(Config) ->
     runner:test(?t_erl_free_compound),
     ok.
@@ -206,7 +201,6 @@ t_erl_free_compound(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_list() function.
 
-t_erl_mk_list(suite) -> [];
 t_erl_mk_list(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_list),
 
@@ -221,7 +215,6 @@ t_erl_mk_list(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_int() function.
 
-t_erl_mk_int(suite) -> [];
 t_erl_mk_int(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_int),
 
@@ -277,7 +270,6 @@ t_erl_mk_int(Config) when is_list(Config) ->
 
 %% Basic test of erl_copy_term().
 
-basic_copy(suite) -> [];
 basic_copy(Config) when is_list(Config) ->
     runner:test(?basic_copy),
     ok.
@@ -285,7 +277,6 @@ basic_copy(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_tuple() function.
 
-t_erl_mk_tuple(suite) -> [];
 t_erl_mk_tuple(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_tuple),
 
@@ -299,7 +290,6 @@ t_erl_mk_tuple(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_atom() function.
 
-t_erl_mk_atom(suite) -> [];
 t_erl_mk_atom(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_atom),
 
@@ -320,7 +310,6 @@ t_erl_mk_atom(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_binary() function.
 
-t_erl_mk_binary(suite) -> [];
 t_erl_mk_binary(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_binary),
 
@@ -333,7 +322,6 @@ t_erl_mk_binary(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_empty_list() function.
 
-t_erl_mk_empty_list(suite) -> [];
 t_erl_mk_empty_list(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_empty_list),
 
@@ -345,7 +333,6 @@ t_erl_mk_empty_list(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_float() function.
 
-t_erl_mk_float(suite) -> [];
 t_erl_mk_float(Config) when is_list(Config) ->
     case os:type() of 
         vxworks ->
@@ -361,7 +348,6 @@ t_erl_mk_float(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_pid() function.
 
-t_erl_mk_pid(suite) -> [];
 t_erl_mk_pid(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_pid),
 
@@ -371,7 +357,6 @@ t_erl_mk_pid(Config) when is_list(Config) ->
     runner:recv_eot(P),
     ok.
 
-t_erl_mk_xpid(suite) -> [];
 t_erl_mk_xpid(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_xpid),
 
@@ -384,7 +369,6 @@ t_erl_mk_xpid(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_port() function.
 
-t_erl_mk_port(suite) -> [];
 t_erl_mk_port(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_port),
 
@@ -394,7 +378,6 @@ t_erl_mk_port(Config) when is_list(Config) ->
     runner:recv_eot(P),
     ok.
 
-t_erl_mk_xport(suite) -> [];
 t_erl_mk_xport(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_xport),
 
@@ -407,7 +390,6 @@ t_erl_mk_xport(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_ref() function.
 
-t_erl_mk_ref(suite) -> [];
 t_erl_mk_ref(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_ref),
 
@@ -417,7 +399,6 @@ t_erl_mk_ref(Config) when is_list(Config) ->
     runner:recv_eot(P),
     ok.
 
-t_erl_mk_long_ref(suite) -> [];
 t_erl_mk_long_ref(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_long_ref),
 
@@ -431,7 +412,6 @@ t_erl_mk_long_ref(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_string() function.
 
-t_erl_mk_string(suite) -> [];
 t_erl_mk_string(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_string),
 
@@ -452,7 +432,6 @@ t_erl_mk_string(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_estring() function.
 
-t_erl_mk_estring(suite) -> [];
 t_erl_mk_estring(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_estring),
 
@@ -473,7 +452,6 @@ t_erl_mk_estring(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_uint() function.
 
-t_erl_mk_uint(suite) -> [];
 t_erl_mk_uint(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_uint),
 
@@ -490,7 +468,6 @@ t_erl_mk_uint(Config) when is_list(Config) ->
 
 %% This tests the erl_mk_var() function.
 
-t_erl_mk_var(suite) -> [];
 t_erl_mk_var(Config) when is_list(Config) ->
     P = runner:start(?t_erl_mk_var),
 
@@ -508,7 +485,6 @@ t_erl_mk_var(Config) when is_list(Config) ->
 
 %% This tests the erl_cons() function.
 
-t_erl_cons(suite) -> [];
 t_erl_cons(Config) when is_list(Config) ->
     P = runner:start(?t_erl_cons),
 
@@ -529,7 +505,6 @@ t_erl_cons(Config) when is_list(Config) ->
 
 %% Tests the erl_length() function.
 
-t_erl_length(suite) -> [];
 t_erl_length(Config) when is_list(Config) ->
     P = runner:start(?t_erl_length),
 
@@ -553,7 +528,6 @@ erl_length(Port, List) ->
 
 %% Tests the erl_hd() function.
 
-t_erl_hd(suite) -> [];
 t_erl_hd(Config) when is_list(Config) ->
     P = runner:start(?t_erl_hd),
 
@@ -578,7 +552,6 @@ erl_hd(Port, List) ->
 
 %% Tests the erl_tail() function.
 
-t_erl_tl(suite) -> [];
 t_erl_tl(Config) when is_list(Config) ->
     P = runner:start(?t_erl_tl),
 
@@ -603,14 +576,12 @@ erl_tl(Port, List) ->
 
 %% Tests the type checking macros (done in the C program).
 
-type_checks(suite) -> [];
 type_checks(Config) when is_list(Config) ->
     runner:test(?type_checks),
     ok.
 
 %% Tests the extractor macros (done in the C program).
 
-extractor_macros(suite) -> [];
 extractor_macros(Config) when is_list(Config) ->
     runner:test(?extractor_macros),
     ok.
@@ -618,7 +589,6 @@ extractor_macros(Config) when is_list(Config) ->
 
 %% This tests the erl_size() function.
 
-t_erl_size(suite) -> [];
 t_erl_size(Config) when is_list(Config) ->
     P = runner:start(?t_erl_size),
 
@@ -634,7 +604,6 @@ t_erl_size(Config) when is_list(Config) ->
 
 %% This tests the erl_var_content() function.
 
-t_erl_var_content(suite) -> [];
 t_erl_var_content(Config) when is_list(Config) ->
     P = runner:start(?t_erl_var_content),
 
@@ -650,7 +619,6 @@ t_erl_var_content(Config) when is_list(Config) ->
 
 %% This tests the erl_element() function.
 
-t_erl_element(suite) -> [];
 t_erl_element(Config) when is_list(Config) ->
     P = runner:start(?t_erl_element),
 
@@ -677,7 +645,6 @@ t_erl_element(Config) when is_list(Config) ->
 
 %% Tests the erl_iolist_length() function.
 
-t_erl_iolist_length(suite) -> [];
 t_erl_iolist_length(Config) when is_list(Config) ->
     P = runner:start(?t_erl_iolist_length),
 
@@ -745,7 +712,6 @@ erl_iolist_length(Port, List) ->
 
 %% Tests the erl_iolist_to_binary() function.
 
-t_erl_iolist_to_binary(suite) -> [];
 t_erl_iolist_to_binary(Config) when is_list(Config) ->
     P = runner:start(?t_erl_iolist_to_binary),
 
@@ -817,7 +783,6 @@ iolist_to_list(Port, Term) ->
 
 %% Tests the erl_iolist_to_string() function.
 
-t_erl_iolist_to_string(suite) -> [];
 t_erl_iolist_to_string(Config) when is_list(Config) ->
     P = runner:start(?t_erl_iolist_to_string),
 
@@ -900,8 +865,7 @@ iolist_to_string(Port, Term) ->
 %%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-erl_print_term(suite) -> [];
-erl_print_term(doc) -> "Tests the erl_print_term() function";
+%% Tests the erl_print_term() function
 erl_print_term(Config) when is_list(Config) ->
     PrintTerm = print_term(Config),
     P = open_port({spawn, PrintTerm}, [stream]),
@@ -946,8 +910,7 @@ split_pid([$.|Rest], Cur, Result) ->
 split_pid([$>], Cur, Result) ->
     list_to_tuple(Result++[Cur]).
 
-print_string(suite) -> [];
-print_string(doc) -> "Test printing a string with erl_print_term()";
+%% Test printing a string with erl_print_term()
 print_string(Config) when is_list(Config) ->
     PrintTerm = print_term(Config),
     P = open_port({spawn, PrintTerm}, [stream]),
@@ -999,7 +962,6 @@ collect_line1([C|Rest], Result) ->
 
 %% Test case submitted by Per Lundgren, ERV.
 
-high_chaparal(suite) -> [];
 high_chaparal(Config) when is_list(Config) ->
     P = runner:start(?high_chaparal),
     {term, [hello, world]} = get_term(P),
@@ -1007,7 +969,6 @@ high_chaparal(Config) when is_list(Config) ->
     ok.
 
 %% OTP-7448
-broken_data(suite) -> [];
 broken_data(Config) when is_list(Config) ->
     P = runner:start(?broken_data),
     runner:recv_eot(P),
@@ -1032,8 +993,8 @@ print_term(Config) when is_list(Config) ->
 %%% back, without having been mutated into short form. We must take
 %%% care then to check the actual returned ref, and not the original
 %%% one, which is equal to it.
-cnode_1(suite) -> [];
-cnode_1(doc) -> "Tests involving cnode: sends a long ref from a cnode to us";
+
+%% Tests involving cnode: sends a long ref from a cnode to us
 cnode_1(Config) when is_list(Config) ->
     Cnode = filename:join(proplists:get_value(data_dir, Config), "cnode"),
     register(mip, self()),
diff --git a/lib/erl_interface/test/erl_ext_SUITE.erl b/lib/erl_interface/test/erl_ext_SUITE.erl
index 02230025b9..769478d62c 100644
--- a/lib/erl_interface/test/erl_ext_SUITE.erl
+++ b/lib/erl_interface/test/erl_ext_SUITE.erl
@@ -56,36 +56,26 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-compare_tuple(suite) -> [];
-compare_tuple(doc) -> [];
 compare_tuple(Config) when is_list(Config) ->
     P = runner:start(?compare_tuple),
     runner:recv_eot(P),
     ok.
 
-compare_list(suite) -> [];
-compare_list(doc) -> [];
 compare_list(Config) when is_list(Config) ->
     P = runner:start(?compare_list),
     runner:recv_eot(P),
     ok.
 
-compare_string(suite) -> [];
-compare_string(doc) -> [];
 compare_string(Config) when is_list(Config) ->
     P = runner:start(?compare_string),
     runner:recv_eot(P),
     ok.
 
-compare_list_string(suite) -> [];
-compare_list_string(doc) -> [];
 compare_list_string(Config) when is_list(Config) ->
     P = runner:start(?compare_list_string),
     runner:recv_eot(P),
     ok.
 
-compare_nc_ext(suite) -> [];
-compare_nc_ext(doc) -> [];
 compare_nc_ext(Config) when is_list(Config) ->
     P = runner:start(?compare_nc_ext),
     runner:recv_eot(P),
diff --git a/lib/erl_interface/test/erl_format_SUITE.erl b/lib/erl_interface/test/erl_format_SUITE.erl
index dd1d0999df..fc733b5ba1 100644
--- a/lib/erl_interface/test/erl_format_SUITE.erl
+++ b/lib/erl_interface/test/erl_format_SUITE.erl
@@ -55,7 +55,6 @@ end_per_group(_GroupName, Config) ->
 
 %% Tests formatting various atoms.
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
     P = runner:start(?atoms),
 
@@ -94,7 +93,6 @@ atoms(Config) when is_list(Config) ->
 
 %% Tests formatting various tuples
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
     P = runner:start(?tuples),
 
@@ -116,7 +114,6 @@ tuples(Config) when is_list(Config) ->
 
 %% Tests formatting various lists
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
     P = runner:start(?lists),
 
diff --git a/lib/erl_interface/test/erl_match_SUITE.erl b/lib/erl_interface/test/erl_match_SUITE.erl
index 07122f2edf..a40f86f277 100644
--- a/lib/erl_interface/test/erl_match_SUITE.erl
+++ b/lib/erl_interface/test/erl_match_SUITE.erl
@@ -56,7 +56,6 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-atoms(suite) -> [];
 atoms(Config) when is_list(Config) ->
     P = start_matcher(Config),
 
@@ -73,7 +72,6 @@ atoms(Config) when is_list(Config) ->
     runner:finish(P),
     ok.
 
-lists(suite) -> [];
 lists(Config) when is_list(Config) ->
     P = start_matcher(Config),
     eq(P, [], []),
@@ -100,7 +98,6 @@ lists(Config) when is_list(Config) ->
     runner:finish(P),
     ok.
 
-tuples(suite) -> [];
 tuples(Config) when is_list(Config) ->
     P = start_matcher(Config),
 
@@ -128,7 +125,6 @@ tuples(Config) when is_list(Config) ->
     ok.
 
 
-references(suite) -> [];
 references(Config) when is_list(Config) ->
     P = start_matcher(Config),
     Ref1 = make_ref(),
@@ -143,7 +139,6 @@ references(Config) when is_list(Config) ->
     ok.
 
 
-pids(suite) -> [];
 pids(Config) when is_list(Config) ->
     P = start_matcher(Config),
     Pid1 = c:pid(0,1,2),
@@ -158,7 +153,6 @@ pids(Config) when is_list(Config) ->
     ok.
 
 
-ports(suite) -> [];
 ports(Config) when is_list(Config) ->
     case os:type() of
         vxworks ->
@@ -175,7 +169,6 @@ ports(Config) when is_list(Config) ->
             ok
     end.
 
-integers(suite) -> [];
 integers(Config) when is_list(Config) ->
     P = start_matcher(Config),
     I1 = 123,
@@ -194,7 +187,6 @@ integers(Config) when is_list(Config) ->
 
 
 
-floats(suite) -> [];
 floats(Config) when is_list(Config) ->
     P = start_matcher(Config),
     F1 = 3.1414,
@@ -217,7 +209,6 @@ floats(Config) when is_list(Config) ->
 
 
 
-binaries(suite) -> [];
 binaries(Config) when is_list(Config) ->
     P = start_matcher(Config),
     Bin1 = term_to_binary({kalle, 146015, {kungsgatan, 23}}),
@@ -235,7 +226,6 @@ binaries(Config) when is_list(Config) ->
     ok.
 
 
-strings(suite) -> [];
 strings(Config) when is_list(Config) ->
     P = start_matcher(Config),
 
@@ -251,7 +241,6 @@ strings(Config) when is_list(Config) ->
     ok.
 
 
-bind(suite) -> [];
 bind(Config) when is_list(Config) ->
     P = start_bind(Config),
     S = "[X,Y,Z]",
diff --git a/lib/erl_interface/test/port_call_SUITE.erl b/lib/erl_interface/test/port_call_SUITE.erl
index c10476abff..26e1e0eeb4 100644
--- a/lib/erl_interface/test/port_call_SUITE.erl
+++ b/lib/erl_interface/test/port_call_SUITE.erl
@@ -45,7 +45,6 @@ all() ->
     [basic].
 
 
-basic(suite) -> [];
 basic(Config) when is_list(Config) ->
     case os:type() of
         {unix, linux} ->