aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-06 16:35:57 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-06 16:35:57 +0200
commit51f4cb8a43162df3aa2caade4535db31fb979b76 (patch)
tree35ff7b585efd52df6340327e8695a735b11a66d8
parent7c9936f44c70bdcb965a78fcf525f97846fb32a0 (diff)
downloadotp-51f4cb8a43162df3aa2caade4535db31fb979b76.tar.gz
otp-51f4cb8a43162df3aa2caade4535db31fb979b76.tar.bz2
otp-51f4cb8a43162df3aa2caade4535db31fb979b76.zip
Eliminate use of doc and suite clauses
-rw-r--r--erts/test/erl_print_SUITE.erl4
-rw-r--r--erts/test/erlexec_SUITE.erl22
-rw-r--r--erts/test/ethread_SUITE.erl70
-rw-r--r--erts/test/nt_SUITE.erl58
-rw-r--r--erts/test/z_SUITE.erl5
5 files changed, 37 insertions, 122 deletions
diff --git a/erts/test/erl_print_SUITE.erl b/erts/test/erl_print_SUITE.erl
index d52caeb9d6..f68a85b3e5 100644
--- a/erts/test/erl_print_SUITE.erl
+++ b/erts/test/erl_print_SUITE.erl
@@ -55,8 +55,6 @@ end_per_testcase(_Case, _Config) ->
%%
%%
-erlang_display(doc) -> [];
-erlang_display(suite) -> [];
erlang_display(Config) when is_list(Config) ->
put(erlang_display_test, ok),
OAIS = erts_debug:set_internal_state(available_internal_state, true),
@@ -222,8 +220,6 @@ ref_numbers_xstr([N | Ns]) ->
%%
%%
-default_testcase_impl(doc) -> [];
-default_testcase_impl(suite) -> [];
default_testcase_impl(Config) when is_list(Config) -> run_case(Config).
-define(TESTPROG, "erl_print_tests").
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 969270e21b..a80d3b43a5 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -53,11 +53,8 @@ all() ->
[args_file, evil_args_file, env, args_file_env,
otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
-otp_8209(doc) ->
- ["Test that plain first argument does not "
- "destroy -home switch [OTP-8209]"];
-otp_8209(suite) ->
- [];
+%% Test that plain first argument does not
+%% destroy -home switch [OTP-8209]
otp_8209(Config) when is_list(Config) ->
{ok,[[PName]]} = init:get_argument(progname),
SNameS = "erlexec_test_01",
@@ -101,8 +98,6 @@ loop_ping(Node,N) ->
pong
end.
-args_file(doc) -> [];
-args_file(suite) -> [];
args_file(Config) when is_list(Config) ->
AFN1 = privfile("1", Config),
AFN2 = privfile("2", Config),
@@ -175,8 +170,6 @@ args_file(Config) when is_list(Config) ->
Extra),
ok.
-evil_args_file(doc) -> [];
-evil_args_file(suite) -> [];
evil_args_file(Config) when is_list(Config) ->
Lim = 300,
FNums = lists:seq(1, Lim),
@@ -214,8 +207,6 @@ evil_args_file(Config) when is_list(Config) ->
-env(doc) -> [];
-env(suite) -> [];
env(Config) when is_list(Config) ->
os:putenv("ERL_AFLAGS", "-MiscArg1 +#100 -extra +XtraArg1 +XtraArg2"),
CmdLine = "+#200 -MiscArg2 -extra +XtraArg3 +XtraArg4",
@@ -230,8 +221,6 @@ env(Config) when is_list(Config) ->
Extra),
ok.
-args_file_env(doc) -> [];
-args_file_env(suite) -> [];
args_file_env(Config) when is_list(Config) ->
AFN1 = privfile("1", Config),
AFN2 = privfile("2", Config),
@@ -254,8 +243,6 @@ args_file_env(Config) when is_list(Config) ->
ok.
%% Make sure "erl -detached" survives when parent process group gets killed
-otp_7461(doc) -> [];
-otp_7461(suite) -> [];
otp_7461(Config) when is_list(Config) ->
case os:type() of
{unix,_} ->
@@ -328,10 +315,7 @@ otp_7461_remote([halt, Pid]) ->
io:format("halt order from ~p to node ~p\n",[Pid,node()]),
halt().
-zdbbl_dist_buf_busy_limit(doc) ->
- ["Check +zdbbl flag"];
-zdbbl_dist_buf_busy_limit(suite) ->
- [];
+%% Check +zdbbl flag
zdbbl_dist_buf_busy_limit(Config) when is_list(Config) ->
LimKB = 1122233,
LimB = LimKB*1024,
diff --git a/erts/test/ethread_SUITE.erl b/erts/test/ethread_SUITE.erl
index fa85ee9b68..7bea9e0ecf 100644
--- a/erts/test/ethread_SUITE.erl
+++ b/erts/test/ethread_SUITE.erl
@@ -86,52 +86,31 @@ end_per_testcase(_Case, _Config) ->
%%
%%
-create_join_thread(doc) ->
- ["Tests ethr_thr_create and ethr_thr_join."];
-create_join_thread(suite) ->
- [];
+%% Tests ethr_thr_create and ethr_thr_join.
create_join_thread(Config) ->
run_case(Config, "create_join_thread", "").
-equal_tids(doc) ->
- ["Tests ethr_equal_tids."];
-equal_tids(suite) ->
- [];
+%% Tests ethr_equal_tids.
equal_tids(Config) ->
run_case(Config, "equal_tids", "").
-mutex(doc) ->
- ["Tests mutexes."];
-mutex(suite) ->
- [];
+%% Tests mutexes.
mutex(Config) ->
run_case(Config, "mutex", "").
-try_lock_mutex(doc) ->
- ["Tests try lock on mutex."];
-try_lock_mutex(suite) ->
- [];
+%% Tests try lock on mutex.
try_lock_mutex(Config) ->
run_case(Config, "try_lock_mutex", "").
-cond_wait(doc) ->
- ["Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast."];
-cond_wait(suite) ->
- [];
+%% Tests ethr_cond_wait with ethr_cond_signal and ethr_cond_broadcast.
cond_wait(Config) ->
run_case(Config, "cond_wait", "").
-broadcast(doc) ->
- ["Tests that a ethr_cond_broadcast really wakes up all waiting threads"];
-broadcast(suite) ->
- [];
+%% Tests that a ethr_cond_broadcast really wakes up all waiting threads
broadcast(Config) ->
run_case(Config, "broadcast", "").
-detached_thread(doc) ->
- ["Tests detached threads."];
-detached_thread(suite) ->
- [];
+%% Tests detached threads.
detached_thread(Config) ->
case {os:type(), os:version()} of
{{unix,darwin}, {9, _, _}} ->
@@ -143,10 +122,7 @@ detached_thread(Config) ->
run_case(Config, "detached_thread", "")
end.
-max_threads(doc) ->
- ["Tests maximum number of threads."];
-max_threads(suite) ->
- [];
+%% Tests maximum number of threads.
max_threads(Config) ->
case {os:type(), os:version()} of
{{unix,darwin}, {9, _, _}} ->
@@ -158,45 +134,27 @@ max_threads(Config) ->
run_case(Config, "max_threads", "")
end.
-tsd(doc) ->
- ["Tests thread specific data."];
-tsd(suite) ->
- [];
+%% Tests thread specific data.
tsd(Config) ->
run_case(Config, "tsd", "").
-spinlock(doc) ->
- ["Tests spinlocks."];
-spinlock(suite) ->
- [];
+%% Tests spinlocks.
spinlock(Config) ->
run_case(Config, "spinlock", "").
-rwspinlock(doc) ->
- ["Tests rwspinlocks."];
-rwspinlock(suite) ->
- [];
+%% Tests rwspinlocks.
rwspinlock(Config) ->
run_case(Config, "rwspinlock", "").
-rwmutex(doc) ->
- ["Tests rwmutexes."];
-rwmutex(suite) ->
- [];
+%% Tests rwmutexes.
rwmutex(Config) ->
run_case(Config, "rwmutex", "").
-atomic(doc) ->
- ["Tests atomics."];
-atomic(suite) ->
- [];
+%% Tests atomics.
atomic(Config) ->
run_case(Config, "atomic", "").
-dw_atomic_massage(doc) ->
- ["Massage double word atomics"];
-dw_atomic_massage(suite) ->
- [];
+%% Massage double word atomics
dw_atomic_massage(Config) ->
run_case(Config, "dw_atomic_massage", "").
diff --git a/erts/test/nt_SUITE.erl b/erts/test/nt_SUITE.erl
index cdce035438..be24018b5d 100644
--- a/erts/test/nt_SUITE.erl
+++ b/erts/test/nt_SUITE.erl
@@ -123,9 +123,7 @@ make_full_name(Name) ->
%%% The following tests are only run on NT:
-service_basic(doc) ->
- ["Check some basic (cosmetic) service parameters"];
-service_basic(suite) -> [];
+%% Check some basic (cosmetic) service parameters
service_basic(Config) when is_list(Config) ->
Name = "test_service_20",
IntName = Name++"_internal",
@@ -160,10 +158,8 @@ service_basic(Config) when is_list(Config) ->
remove_service(NewName),
ok.
-service_env(doc) ->
- ["Check that service name and executable is in the environment of the " ++
- "erlang process created by erlsrv."];
-service_env(suite) -> [];
+%% Check that service name and executable is in the environment of the
+%% erlang process created by erlsrv.
service_env(Config) when is_list(Config) ->
Name = "test_service_2",
Service = [{servicename,Name},
@@ -183,10 +179,9 @@ service_env(Config) when is_list(Config) ->
"\""))),
remove_service(Name),
ok.
-user_env(doc) ->
- ["Check that the user defined environment is ADDED to the service's"++
- " normal dito."];
-user_env(suite) -> [];
+
+%% Check that the user defined environment is ADDED to the service's
+%% normal dito.
user_env(Config) when is_list(Config) ->
Name = "test_service_3",
Service = [{servicename,Name},{env,[{"HUBBA","BUBBA"}]},
@@ -199,10 +194,9 @@ user_env(Config) when is_list(Config) ->
"BUBBA" = rpc:call(make_full_name(Name),os,getenv,["HUBBA"]),
remove_service(Name),
ok.
-synced(doc) ->
- ["Check that services are stopped and started syncronous and that"++
- " failed stopactions kill the erlang machine anyway."];
-synced(suite) -> [];
+
+%% Check that services are stopped and started syncronous and that
+%% failed stopactions kill the erlang machine anyway.
synced(Config) when is_list(Config) ->
Name0 = "test_service_4",
Service0 = [{servicename,Name0},
@@ -232,10 +226,9 @@ synced(Config) when is_list(Config) ->
calendar:universal_time()) - T2,
true = Diff2 > 30,
ok.
-service_prio(doc) ->
- ["Check that a service with higher prio create port programs with "
- "higher prio."];
-service_prio(suite) -> [];
+
+%% Check that a service with higher prio create port programs with
+%% higher prio.
service_prio(Config) when is_list(Config) ->
Name = "test_service_6",
Service = [{servicename,Name},{prio,"high"},
@@ -255,16 +248,14 @@ service_prio(Config) when is_list(Config) ->
%% started at the same time...
{value, {"heart.exe",_,"high"}} = lists:keysearch("heart.exe",1,Diff),
ok.
-logout(doc) ->
- ["Check that logout does not kill services"];
-logout(suite) -> [];
+
+%% Check that logout does not kill services
logout(Config) when is_list(Config) ->
{comment, "Have to be run manually by registering a service with " ++
"heart, logout and log in again and then examine that the heart " ++
"process id is not changed."}.
-debug(doc) ->
- ["Check the debug options to erlsrv."];
-debug(suite) -> [];
+
+%% Check the debug options to erlsrv.
debug(Config) when is_list(Config) ->
Name0 = "test_service_7",
@@ -311,9 +302,7 @@ debug(Config) when is_list(Config) ->
file:delete(NF),
ok.
-restart(doc) ->
- ["Check the restart options to erlsrv"];
-restart(suite) -> [];
+%% Check the restart options to erlsrv
restart(Config) when is_list(Config) ->
Name = "test_service_9",
Service = [{servicename,Name},
@@ -333,9 +322,7 @@ restart(Config) when is_list(Config) ->
remove_service(Name),
ok.
-restart_always(doc) ->
- ["Check the restart options to erlsrv"];
-restart_always(suite) -> [];
+%% Check the restart options to erlsrv
restart_always(Config) when is_list(Config) ->
Name = "test_service_10",
Service = [{servicename,Name},
@@ -353,9 +340,8 @@ restart_always(Config) when is_list(Config) ->
true = wait_for_node(Name),
remove_service(Name),
ok.
-stopaction(doc) ->
- ["Check that stopaction does not hang output while shutting down"];
-stopaction(suite) -> [];
+
+%% Check that stopaction does not hang output while shutting down
stopaction(Config) when is_list(Config) ->
Name = "test_service_11",
%% Icky, I prepend the first element in the codepath, cause
@@ -380,10 +366,6 @@ stopaction(Config) when is_list(Config) ->
%%% This test is run on all platforms, but just gives a comment on
%%% other platforms than NT.
-nt(doc) ->
- ["Run NT specific tests."];
-nt(suite) ->
- [];
nt(Config) when is_list(Config) ->
case os:type() of
{win32,nt} ->
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 204f393e93..de3e1c24a4 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -45,11 +45,6 @@ suite() ->
all() ->
[core_files].
-
-core_files(doc) ->
- [];
-core_files(suite) ->
- [];
core_files(Config) when is_list(Config) ->
case os:type() of
{win32, _} ->