aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-12-06 16:48:31 +0100
committerLukas Larsson <[email protected]>2011-02-17 17:33:19 +0100
commit83f932257470f5ae01fc61130e997fdea0562653 (patch)
tree8a9eb98fd60c89e09dca5f858f76b1b318374524 /lib/os_mon
parent19d5a0e59f9897361d18b3c8987561620a212f04 (diff)
downloadotp-83f932257470f5ae01fc61130e997fdea0562653.tar.gz
otp-83f932257470f5ae01fc61130e997fdea0562653.tar.bz2
otp-83f932257470f5ae01fc61130e997fdea0562653.zip
Add ts_install_scb to suite/0
Diffstat (limited to 'lib/os_mon')
-rw-r--r--lib/os_mon/test/cpu_sup_SUITE.erl4
-rw-r--r--lib/os_mon/test/disksup_SUITE.erl4
-rw-r--r--lib/os_mon/test/memsup_SUITE.erl4
-rw-r--r--lib/os_mon/test/os_mon_SUITE.erl4
-rw-r--r--lib/os_mon/test/os_mon_mib_SUITE.erl4
-rw-r--r--lib/os_mon/test/os_sup_SUITE.erl4
6 files changed, 18 insertions, 6 deletions
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
index 7c51b9b54b..95c17e61a4 100644
--- a/lib/os_mon/test/cpu_sup_SUITE.erl
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -20,7 +20,7 @@
-include_lib("test_server/include/test_server.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([init_per_suite/1, end_per_suite/1]).
-export([init_per_testcase/2, end_per_testcase/2]).
@@ -50,6 +50,8 @@ end_per_testcase(_Case, Config) ->
?t:timetrap_cancel(Dog),
ok.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
case test_server:os_type() of
{unix, sunos} ->
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index f21b8db2ae..f33bde21c6 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -20,7 +20,7 @@
-include_lib("test_server/include/test_server.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([init_per_suite/1, end_per_suite/1]).
-export([init_per_testcase/2, end_per_testcase/2]).
@@ -50,6 +50,8 @@ end_per_testcase(_Case, Config) ->
?t:timetrap_cancel(Dog),
ok.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
Bugs = [otp_5910],
case test_server:os_type() of
diff --git a/lib/os_mon/test/memsup_SUITE.erl b/lib/os_mon/test/memsup_SUITE.erl
index dc7af32746..96748990de 100644
--- a/lib/os_mon/test/memsup_SUITE.erl
+++ b/lib/os_mon/test/memsup_SUITE.erl
@@ -20,7 +20,7 @@
-include_lib("test_server/include/test_server.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([init_per_suite/1, end_per_suite/1]).
-export([init_per_testcase/2, end_per_testcase/2]).
@@ -49,6 +49,8 @@ end_per_testcase(_Case, Config) ->
?t:timetrap_cancel(Dog),
Config.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
All = case test_server:os_type() of
{unix, sunos} ->
diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl
index f5dea6a92d..2706873b79 100644
--- a/lib/os_mon/test/os_mon_SUITE.erl
+++ b/lib/os_mon/test/os_mon_SUITE.erl
@@ -20,7 +20,7 @@
-include_lib("test_server/include/test_server.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([init_per_testcase/2, end_per_testcase/2]).
%% Test cases
@@ -38,6 +38,8 @@ end_per_testcase(_Case, Config) ->
test_server:timetrap_cancel(Dog),
ok.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
case test_server:os_type() of
{unix, sunos} -> [app_file, config];
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl
index d784b636ff..8529cf5e0e 100644
--- a/lib/os_mon/test/os_mon_mib_SUITE.erl
+++ b/lib/os_mon/test/os_mon_mib_SUITE.erl
@@ -30,7 +30,7 @@
-endif.
% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, end_per_suite/1,
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, end_per_suite/1,
init_per_testcase/2, end_per_testcase/2]).
@@ -77,6 +77,8 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
test_server:timetrap_cancel(Dog),
Config.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[load_unload, get_mem_sys_mark, get_mem_proc_mark,
get_disk_threshold, get_load_table,
diff --git a/lib/os_mon/test/os_sup_SUITE.erl b/lib/os_mon/test/os_sup_SUITE.erl
index 02e1acf1b7..878efedd49 100644
--- a/lib/os_mon/test/os_sup_SUITE.erl
+++ b/lib/os_mon/test/os_sup_SUITE.erl
@@ -20,7 +20,7 @@
-include_lib("test_server/include/test_server.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-export([init_per_suite/1, end_per_suite/1]).
-export([init_per_testcase/2, end_per_testcase/2]).
@@ -63,6 +63,8 @@ end_per_testcase(_Case, Config) ->
?t:timetrap_cancel(Dog),
ok.
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
case test_server:os_type() of
{unix, sunos} -> [message, config, port];