aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
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/inets
parent19d5a0e59f9897361d18b3c8987561620a212f04 (diff)
downloadotp-83f932257470f5ae01fc61130e997fdea0562653.tar.gz
otp-83f932257470f5ae01fc61130e997fdea0562653.tar.bz2
otp-83f932257470f5ae01fc61130e997fdea0562653.zip
Add ts_install_scb to suite/0
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/test/ftp_SUITE.erl4
-rw-r--r--lib/inets/test/ftp_format_SUITE.erl4
-rw-r--r--lib/inets/test/http_format_SUITE.erl4
-rw-r--r--lib/inets/test/httpc_SUITE.erl2
-rw-r--r--lib/inets/test/httpc_cookie_SUITE.erl4
-rw-r--r--lib/inets/test/httpd_SUITE.erl4
-rw-r--r--lib/inets/test/httpd_basic_SUITE.erl2
-rw-r--r--lib/inets/test/inets_SUITE.erl2
-rw-r--r--lib/inets/test/inets_sup_SUITE.erl2
-rw-r--r--lib/inets/test/tftp_SUITE.erl2
10 files changed, 25 insertions, 5 deletions
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
index 691157534b..173731b1ca 100644
--- a/lib/inets/test/ftp_SUITE.erl
+++ b/lib/inets/test/ftp_SUITE.erl
@@ -24,7 +24,7 @@
-include("test_server_line.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]).
-export([init_per_suite/1, end_per_suite/1]).
@@ -72,6 +72,8 @@
%% Description: Returns documentation/test cases in this test suite
%% or a skip tuple if the platform is not supported.
%%--------------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[{group, solaris8_test}, {group, solaris9_test},
{group, solaris10_test}, {group, linux_x86_test},
diff --git a/lib/inets/test/ftp_format_SUITE.erl b/lib/inets/test/ftp_format_SUITE.erl
index 2499176898..9c0b904db7 100644
--- a/lib/inets/test/ftp_format_SUITE.erl
+++ b/lib/inets/test/ftp_format_SUITE.erl
@@ -25,7 +25,7 @@
-include("ftp_internal.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2, 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_testcase/2, end_per_testcase/2]).
%% Test cases must be exported.
-export([ ftp_150/1,
@@ -33,6 +33,8 @@
ftp_other_status_codes/1, ftp_multiple_lines/1,
ftp_multipel_ctrl_messages/1, format_error/1]).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[{group, ftp_response}, format_error].
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index c53ae446d8..8abf93558b 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -26,7 +26,7 @@
-include("http_internal.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2, 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_testcase/2, end_per_testcase/2]).
%% Test cases must be exported.
-export([ chunk_decode/1, chunk_encode/1,
@@ -37,6 +37,8 @@
esi_parse_headers/1, cgi_parse_headers/1,
is_absolut_uri/1, convert_netscapecookie_date/1]).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[{group, chunk}, http_response, http_request,
validate_request_line, {group, script}, is_absolut_uri,
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 328b0a01f8..f1dbddee06 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -59,6 +59,8 @@
%% or a skip tuple if the platform is not supported.
%%--------------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[proxy_options, proxy_head, proxy_get, proxy_trace,
proxy_post, proxy_put, proxy_delete, proxy_auth,
diff --git a/lib/inets/test/httpc_cookie_SUITE.erl b/lib/inets/test/httpc_cookie_SUITE.erl
index 31bc4f510a..f0885faf47 100644
--- a/lib/inets/test/httpc_cookie_SUITE.erl
+++ b/lib/inets/test/httpc_cookie_SUITE.erl
@@ -23,7 +23,7 @@
-include_lib("stdlib/include/ms_transform.hrl").
%% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2, 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_testcase/2, end_per_testcase/2]).
%% Test cases must be exported.
-export([session_cookies_only/1, netscape_cookies/1,
@@ -116,6 +116,8 @@ end_per_testcase(Case, Config) ->
%% Name of a test case.
%% Description: Returns a list of all test cases in this test suite
%%--------------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[session_cookies_only, netscape_cookies, cookie_cancel,
cookie_expires, persistent_cookie, domain_cookie,
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index b93edaf93b..978ea0f817 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -27,7 +27,7 @@
-include_lib("kernel/include/file.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,
init_per_suite/1, end_per_suite/1]).
@@ -248,6 +248,8 @@
%% Description: Returns documentation/test cases in this test suite
%% or a skip tuple if the platform is not supported.
%%--------------------------------------------------------------------
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[{group, ip}, {group, ssl}, {group, http_1_1_ip},
{group, http_1_0_ip}, {group, http_0_9_ip},
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 8a654a7480..a67a082da9 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -26,6 +26,8 @@
-define(URL_START, "http://localhost:").
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[uri_too_long_414, header_too_long_413, escaped_url_in_error_body].
diff --git a/lib/inets/test/inets_SUITE.erl b/lib/inets/test/inets_SUITE.erl
index 3907e5ac3d..593ad2efc6 100644
--- a/lib/inets/test/inets_SUITE.erl
+++ b/lib/inets/test/inets_SUITE.erl
@@ -28,6 +28,8 @@
-define(NUM_DEFAULT_SERVICES, 1).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[{group, app_test}, {group, appup_test},
{group, services_test}, httpd_reload].
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index aef59597a8..f542506d00 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -26,6 +26,8 @@
%% Note: This directive should only be used in test suites.
-compile(export_all).
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[default_tree, ftpc_worker, tftpd_worker, httpd_subtree,
httpc_subtree].
diff --git a/lib/inets/test/tftp_SUITE.erl b/lib/inets/test/tftp_SUITE.erl
index 44fc189a96..41e06f493f 100644
--- a/lib/inets/test/tftp_SUITE.erl
+++ b/lib/inets/test/tftp_SUITE.erl
@@ -71,6 +71,8 @@ end_per_testcase(Case, Config) when is_list(Config) ->
%% Top test case
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
all() ->
[simple, extra, reuse_connection, resend_client,
resend_server].