aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erix.ericsson.se>2010-12-06 16:48:31 +0100
committerLukas Larsson <lukas@erix.ericsson.se>2011-02-17 17:33:19 +0100
commit83f932257470f5ae01fc61130e997fdea0562653 (patch)
tree8a9eb98fd60c89e09dca5f858f76b1b318374524 /lib/ic
parent19d5a0e59f9897361d18b3c8987561620a212f04 (diff)
downloadotp-83f932257470f5ae01fc61130e997fdea0562653.tar.gz
otp-83f932257470f5ae01fc61130e997fdea0562653.tar.bz2
otp-83f932257470f5ae01fc61130e997fdea0562653.zip
Add ts_install_scb to suite/0
Diffstat (limited to 'lib/ic')
-rw-r--r--lib/ic/test/c_client_erl_server_SUITE.erl4
-rw-r--r--lib/ic/test/c_client_erl_server_proto_SUITE.erl4
-rw-r--r--lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl4
-rw-r--r--lib/ic/test/erl_client_c_server_SUITE.erl4
-rw-r--r--lib/ic/test/erl_client_c_server_proto_SUITE.erl4
-rw-r--r--lib/ic/test/ic_SUITE.erl4
-rw-r--r--lib/ic/test/ic_be_SUITE.erl4
-rw-r--r--lib/ic/test/ic_pp_SUITE.erl4
-rw-r--r--lib/ic/test/ic_pragma_SUITE.erl4
-rw-r--r--lib/ic/test/ic_register_SUITE.erl4
-rw-r--r--lib/ic/test/java_client_erl_server_SUITE.erl4
11 files changed, 33 insertions, 11 deletions
diff --git a/lib/ic/test/c_client_erl_server_SUITE.erl b/lib/ic/test/c_client_erl_server_SUITE.erl
index e23b943348..9434aaed49 100644
--- a/lib/ic/test/c_client_erl_server_SUITE.erl
+++ b/lib/ic/test/c_client_erl_server_SUITE.erl
@@ -27,7 +27,7 @@
-include_lib("common_test/include/ct.hrl").
-export([init_per_testcase/2, end_per_testcase/2,
- all/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
+ all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
unsigned_short_test/1, unsigned_long_test/1,
unsigned_long_long_test/1, double_test/1, char_test/1,
wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
@@ -63,6 +63,8 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[void_test, long_test, long_long_test,
unsigned_short_test, unsigned_long_test,
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_SUITE.erl
index fa7ab31db8..9434f232a3 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE.erl
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE.erl
@@ -26,7 +26,7 @@
-include_lib("common_test/include/ct.hrl").
-export([init_per_testcase/2, end_per_testcase/2,
- all/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
+ all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
unsigned_short_test/1, unsigned_long_test/1,
unsigned_long_long_test/1, double_test/1, char_test/1,
wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
@@ -62,6 +62,8 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[void_test, long_test, long_long_test,
unsigned_short_test, unsigned_long_test,
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
index 625a7fd253..887a76860f 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE.erl
@@ -26,7 +26,7 @@
-include_lib("common_test/include/ct.hrl").
-export([init_per_testcase/2, end_per_testcase/2,
- all/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
+ all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, void_test/1, long_test/1, long_long_test/1,
unsigned_short_test/1, unsigned_long_test/1,
unsigned_long_long_test/1, double_test/1, char_test/1,
wchar_test/1, octet_test/1, bool_test/1, struct_test/1,
@@ -62,6 +62,8 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[void_test, long_test, long_long_test,
unsigned_short_test, unsigned_long_test,
diff --git a/lib/ic/test/erl_client_c_server_SUITE.erl b/lib/ic/test/erl_client_c_server_SUITE.erl
index 5dc3049671..ab11b682ac 100644
--- a/lib/ic/test/erl_client_c_server_SUITE.erl
+++ b/lib/ic/test/erl_client_c_server_SUITE.erl
@@ -26,7 +26,7 @@
-module(erl_client_c_server_SUITE).
-include_lib("common_test/include/ct.hrl").
--export([init_per_testcase/2, end_per_testcase/2,all/0,groups/0,init_per_group/2,end_per_group/2, void_test/1,
+-export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, void_test/1,
long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
@@ -63,6 +63,8 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[void_test, long_test, longlong_test, ushort_test,
ulong_test, ulonglong_test, double_test, char_test,
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE.erl b/lib/ic/test/erl_client_c_server_proto_SUITE.erl
index b5f49ba13e..f926f71060 100644
--- a/lib/ic/test/erl_client_c_server_proto_SUITE.erl
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE.erl
@@ -26,7 +26,7 @@
-module(erl_client_c_server_proto_SUITE).
-include_lib("common_test/include/ct.hrl").
--export([init_per_testcase/2, end_per_testcase/2,all/0,groups/0,init_per_group/2,end_per_group/2, void_test/1,
+-export([init_per_testcase/2, end_per_testcase/2,all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, void_test/1,
long_test/1, longlong_test/1, ushort_test/1, ulong_test/1,
ulonglong_test/1, double_test/1, char_test/1, wchar_test/1,
octet_test/1, bool_test/1, struct_test/1, struct2_test/1,
@@ -63,6 +63,8 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[void_test, long_test, longlong_test, ushort_test,
ulong_test, ulonglong_test, double_test, char_test,
diff --git a/lib/ic/test/ic_SUITE.erl b/lib/ic/test/ic_SUITE.erl
index ac77d9c10e..ed6b2b9891 100644
--- a/lib/ic/test/ic_SUITE.erl
+++ b/lib/ic/test/ic_SUITE.erl
@@ -24,7 +24,7 @@
-module(ic_SUITE).
-include_lib("test_server/include/test_server.hrl").
--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]).
-include_lib("orber/src/orber_ifr.hrl").
@@ -86,6 +86,8 @@
%% Top of cases
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[app_test, {group, const}, {group, union},
{group, enum}, {group, attr}, {group, type},
diff --git a/lib/ic/test/ic_be_SUITE.erl b/lib/ic/test/ic_be_SUITE.erl
index e53cbf9a15..7db2996cc1 100644
--- a/lib/ic/test/ic_be_SUITE.erl
+++ b/lib/ic/test/ic_be_SUITE.erl
@@ -25,7 +25,7 @@
-include_lib("test_server/include/test_server.hrl").
--export([all/0,groups/0,init_per_group/2,end_per_group/2,plain/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,plain/1]).
-define(OUT(X), filename:join([?config(priv_dir, Config), gen, to_list(X)])).
@@ -33,6 +33,8 @@
%% Top of cases
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[plain].
diff --git a/lib/ic/test/ic_pp_SUITE.erl b/lib/ic/test/ic_pp_SUITE.erl
index 140c81feeb..b36b14fd5d 100644
--- a/lib/ic/test/ic_pp_SUITE.erl
+++ b/lib/ic/test/ic_pp_SUITE.erl
@@ -32,7 +32,7 @@
-define(GCC, "g++").
-define(GCC_VER, "2.95.3").
--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([arg_norm/1]).
-export([cascade_norm/1]).
-export([comment_norm/1]).
@@ -54,6 +54,8 @@
-export([cases/0, init_per_suite/1, end_per_suite/1]).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
cases().
diff --git a/lib/ic/test/ic_pragma_SUITE.erl b/lib/ic/test/ic_pragma_SUITE.erl
index ae43e7f64d..da1c4e11aa 100644
--- a/lib/ic/test/ic_pragma_SUITE.erl
+++ b/lib/ic/test/ic_pragma_SUITE.erl
@@ -32,7 +32,7 @@
%%-----------------------------------------------------------------
%% External 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]).
-export([ifr_pragma_reg/1, pragma_error/1, uggly_pragmas/1]).
@@ -53,6 +53,8 @@
%% Args:
%% Returns:
%%-----------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
cases().
diff --git a/lib/ic/test/ic_register_SUITE.erl b/lib/ic/test/ic_register_SUITE.erl
index 6531030dc8..14e83f16a3 100644
--- a/lib/ic/test/ic_register_SUITE.erl
+++ b/lib/ic/test/ic_register_SUITE.erl
@@ -31,7 +31,7 @@
%%-----------------------------------------------------------------
%% External exports
%%-----------------------------------------------------------------
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, end_per_suite/1, ifr_reg_unreg/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_suite/1, end_per_suite/1, ifr_reg_unreg/1]).
-export([ifr_inheritence_reg/1,ifr_reg_unreg_with_inheritence/1]).
-export([ifr_reg_unreg_with_inheritence_bad_order/1]).
@@ -57,6 +57,8 @@
%% Args:
%% Returns:
%%-----------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
cases().
diff --git a/lib/ic/test/java_client_erl_server_SUITE.erl b/lib/ic/test/java_client_erl_server_SUITE.erl
index f2683896ed..6d4e530ffb 100644
--- a/lib/ic/test/java_client_erl_server_SUITE.erl
+++ b/lib/ic/test/java_client_erl_server_SUITE.erl
@@ -25,7 +25,7 @@
-include_lib("test_server/include/test_server.hrl").
--export([all/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]).
+-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]).
-export([marshal_ll/1,marshal_ull/1,
marshal_l/1,marshal_ul/1,
marshal_s/1,marshal_us/1,
@@ -36,6 +36,8 @@
%% Top of cases
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
cases().