From 83f932257470f5ae01fc61130e997fdea0562653 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 6 Dec 2010 16:48:31 +0100 Subject: Add ts_install_scb to suite/0 --- lib/tools/test/cover_SUITE.erl | 4 +++- lib/tools/test/cprof_SUITE.erl | 4 +++- lib/tools/test/emem_SUITE.erl | 4 +++- lib/tools/test/eprof_SUITE.erl | 4 +++- lib/tools/test/fprof_SUITE.erl | 4 +++- lib/tools/test/instrument_SUITE.erl | 4 +++- lib/tools/test/lcnt_SUITE.erl | 4 +++- lib/tools/test/make_SUITE.erl | 6 ++++-- lib/tools/test/tools_SUITE.erl | 4 +++- lib/tools/test/xref_SUITE.erl | 4 +++- 10 files changed, 31 insertions(+), 11 deletions(-) (limited to 'lib/tools') diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl index aeda99c5fd..5540754270 100644 --- a/lib/tools/test/cover_SUITE.erl +++ b/lib/tools/test/cover_SUITE.erl @@ -18,7 +18,7 @@ %% -module(cover_SUITE). --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([start/1, compile/1, analyse/1, misc/1, stop/1, distribution/1, export_import/1, otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1, @@ -37,6 +37,8 @@ %% y %%---------------------------------------------------------------------- +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> case whereis(cover_server) of undefined -> diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl index 2f118deebe..679795df60 100644 --- a/lib/tools/test/cprof_SUITE.erl +++ b/lib/tools/test/cprof_SUITE.erl @@ -63,7 +63,7 @@ config(data_dir, _) -> "cprof_SUITE_data". -else. %% When run in test server. --export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]). -export([basic/1, on_load/1, modules/1]). init_per_testcase(_Case, Config) -> @@ -78,6 +78,8 @@ end_per_testcase(_Case, Config) -> test_server:timetrap_cancel(Dog), ok. +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> case test_server:is_native(cprof_SUITE) of true -> [not_run]; diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl index fdedcef650..6c67375e53 100644 --- a/lib/tools/test/emem_SUITE.erl +++ b/lib/tools/test/emem_SUITE.erl @@ -24,7 +24,7 @@ receive_and_save_trace/2, send_trace/2]). --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]). -export([live_node/1, 'sparc_sunos5.8_32b_emt2.0'/1, @@ -65,6 +65,8 @@ %% %% +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> case is_debug_compiled() of true -> {skip, "Not run when debug compiled"}; diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl index fa5fdf30e4..a24e822305 100644 --- a/lib/tools/test/eprof_SUITE.erl +++ b/lib/tools/test/eprof_SUITE.erl @@ -20,7 +20,9 @@ -include_lib("test_server/include/test_server.hrl"). --export([all/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]). + +suite() -> [{suite_callbacks,[ts_install_scb]}]. all() -> [basic, tiny, eed]. diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl index 5ecb150e09..98033560c3 100644 --- a/lib/tools/test/fprof_SUITE.erl +++ b/lib/tools/test/fprof_SUITE.erl @@ -21,7 +21,7 @@ -include_lib("test_server/include/test_server.hrl"). %% Test server framework exports --export([all/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]). %% Test suites -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1, @@ -54,6 +54,8 @@ +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> case test_server:is_native(fprof_SUITE) of true -> [not_run]; diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl index f607dab727..5b13a42143 100644 --- a/lib/tools/test/instrument_SUITE.erl +++ b/lib/tools/test/instrument_SUITE.erl @@ -18,7 +18,7 @@ %% -module(instrument_SUITE). --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]). -export(['+Mim true'/1, '+Mis true'/1]). @@ -33,6 +33,8 @@ end_per_testcase(_Case, Config) -> ?t:timetrap_cancel(Dog), ok. +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> ['+Mim true', '+Mis true']. diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl index eeae182d8e..3de25766fb 100644 --- a/lib/tools/test/lcnt_SUITE.erl +++ b/lib/tools/test/lcnt_SUITE.erl @@ -21,7 +21,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]). @@ -51,6 +51,8 @@ end_per_testcase(_Case, Config) -> ?t:timetrap_cancel(Dog), ok. +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [load_v1, conflicts, locations, swap_keys]. diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl index d0692c9d6a..a4c9546eb8 100644 --- a/lib/tools/test/make_SUITE.erl +++ b/lib/tools/test/make_SUITE.erl @@ -18,7 +18,7 @@ %% -module(make_SUITE). --export([all/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]). -export([otp_6057_init/1, otp_6057_a/1, otp_6057_b/1, otp_6057_c/1, otp_6057_end/1]). @@ -35,6 +35,8 @@ %% that the file :"test5.erl" shall be compiled with the 'S' option, %% i.e. produce "test5.S" instead of "test5." +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [make_all, make_files, otp_6057_a, otp_6057_b, otp_6057_c]. @@ -156,7 +158,7 @@ otp_6057_init(Config) when is_list(Config) -> otp_6057_a(suite) -> []; otp_6057_a(doc) -> - ["Test that make:all/0 looks for object file in correct place"]; + ["Test that make:all/0, suite/0 looks for object file in correct place"]; otp_6057_a(Config) when is_list(Config) -> ?line PrivDir = ?config(priv_dir, Config), diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl index 39d22b67cd..f587098a15 100644 --- a/lib/tools/test/tools_SUITE.erl +++ b/lib/tools/test/tools_SUITE.erl @@ -25,12 +25,14 @@ -define(application, tools). %% 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 must be exported. -export([app_test/1]). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [app_test]. diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index 7ce77b94c5..9d5597447e 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -36,7 +36,7 @@ -define(copydir, ?config(copy_dir, Conf)). -endif. --export([all/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]). +-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]). -export([ addrem/1, convert/1, intergraph/1, lines/1, loops/1, @@ -68,6 +68,8 @@ -include_lib("tools/src/xref.hrl"). +suite() -> [{suite_callbacks,[ts_install_scb]}]. + all() -> [{group, xref}, {group, files}, {group, analyses}, {group, misc}]. -- cgit v1.2.3