diff options
Diffstat (limited to 'lib/tools')
-rw-r--r-- | lib/tools/test/cover_SUITE.erl | 50 | ||||
-rw-r--r-- | lib/tools/test/cprof_SUITE.erl | 15 | ||||
-rw-r--r-- | lib/tools/test/emem_SUITE.erl | 24 | ||||
-rw-r--r-- | lib/tools/test/eprof_SUITE.erl | 3 | ||||
-rw-r--r-- | lib/tools/test/fprof_SUITE.erl | 40 | ||||
-rw-r--r-- | lib/tools/test/instrument_SUITE.erl | 6 | ||||
-rw-r--r-- | lib/tools/test/lcnt_SUITE.erl | 12 | ||||
-rw-r--r-- | lib/tools/test/make_SUITE.erl | 19 | ||||
-rw-r--r-- | lib/tools/test/tools_SUITE.erl | 5 | ||||
-rw-r--r-- | lib/tools/test/xref_SUITE.erl | 91 |
10 files changed, 62 insertions, 203 deletions
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl index 859c8a4d46..b4c9264b30 100644 --- a/lib/tools/test/cover_SUITE.erl +++ b/lib/tools/test/cover_SUITE.erl @@ -122,7 +122,6 @@ coverage_analysis(Config) when is_list(Config) -> {ok,Outfile} = cover:analyze_to_file(?MODULE, Outfile, [html]), ok. -start(suite) -> []; start(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -132,7 +131,6 @@ start(Config) when is_list(Config) -> {ok, Pid} = cover:start(), {error, {already_started, Pid}} = cover:start(). -compile(suite) -> []; compile(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -215,7 +213,6 @@ simple_crypto_fun(Key) -> ({debug_info, des3_cbc, crypt, _}) -> Key end. -analyse(suite) -> []; analyse(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -402,7 +399,6 @@ analyse(Config) when is_list(Config) -> {error,{not_cover_compiled,g}} = cover:analyse_to_file(g), {result,[],[{not_cover_compiled,g}]} = cover:analyse_to_file([g]). -misc(suite) -> []; misc(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -421,7 +417,6 @@ misc(Config) when is_list(Config) -> {ok, {a,{0,19}}} = cover:analyse(a, module), ok = cover:reset(). -stop(suite) -> []; stop(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -438,7 +433,6 @@ stop(Config) when is_list(Config) -> remove(files(Files, ".html")), remove(files(Files, ".beam")). -distribution(suite) -> []; distribution(Config) when is_list(Config) -> DataDir = proplists:get_value(data_dir, Config), ok = file:set_cwd(DataDir), @@ -845,7 +839,6 @@ generate_clauses(C,Func) -> generate_clauses(C-1,Func)]. -export_import(suite) -> []; export_import(Config) when is_list(Config) -> DataDir = proplists:get_value(data_dir, Config), ok = file:set_cwd(DataDir), @@ -947,7 +940,6 @@ export_import(Config) when is_list(Config) -> remove(["f_exported","all_exported"|files(Files, ".beam")]). -otp_5031(suite) -> []; otp_5031(Config) when is_list(Config) -> ct:timetrap({seconds, 10}), @@ -958,10 +950,7 @@ otp_5031(Config) when is_list(Config) -> test_server:stop_node(N1), ok. -eif(doc) -> - ["Test the \'Exclude Included Functions\' functionality"]; -eif(suite) -> - []; +%% Test the \'Exclude Included Functions\' functionality eif(Config) when is_list(Config) -> ok = file:set_cwd(filename:join(proplists:get_value(data_dir, Config), "included_functions")), @@ -975,7 +964,6 @@ eif(Config) when is_list(Config) -> {ok, [_, _]} = cover:analyse(cover_inc, line), ok. -otp_5305(suite) -> []; otp_5305(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(priv_dir, Config)), @@ -989,10 +977,8 @@ otp_5305(Config) when is_list(Config) -> ok = file:write_file(File, Test), {ok, t} = cover:compile(File), ok = file:delete(File), - ok. -otp_5418(suite) -> []; otp_5418(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(priv_dir, Config)), @@ -1003,7 +989,6 @@ otp_5418(Config) when is_list(Config) -> {ok, t} = cover:compile(File), {ok,{t,{0,0}}} = cover:analyse(t, module), ok = file:delete(File), - ok. otp_6115(Config) when is_list(Config) -> @@ -1056,9 +1041,7 @@ otp_6115(Config) when is_list(Config) -> file:set_cwd(CWD), ok. -otp_7095(doc) -> - ["andalso/orelse"]; -otp_7095(suite) -> []; +%% andalso/orelse otp_7095(Config) when is_list(Config) -> ok = file:set_cwd(proplists:get_value(priv_dir, Config)), @@ -1164,13 +1147,10 @@ otp_7095(Config) when is_list(Config) -> {{t,76},0},{{t,78},1}, {{t,82},2}]} = cover:analyse(t, calls, line), ok = file:delete(File), - ok. -otp_8270(doc) -> - ["OTP-8270. Bug."]; -otp_8270(suite) -> []; +%% OTP-8270. Bug. otp_8270(Config) when is_list(Config) -> DataDir = proplists:get_value(data_dir, Config), ok = file:set_cwd(DataDir), @@ -1226,9 +1206,7 @@ otp_8270(Config) when is_list(Config) -> test_server:stop_node(N3), ok. -otp_8273(doc) -> - ["OTP-8273. Bug."]; -otp_8273(suite) -> []; +%% OTP-8273. Bug. otp_8273(Config) when is_list(Config) -> Test = <<"-module(t). -export([t/0]). @@ -1243,21 +1221,16 @@ otp_8273(Config) when is_list(Config) -> ok. -otp_8340(doc) -> - ["OTP-8340. Bug."]; -otp_8340(suite) -> []; +%% OTP-8340. Bug. otp_8340(Config) when is_list(Config) -> [{{t,1},1},{{t,2},1},{{t,4},1}] = analyse_expr(<<"<< \n" " <<3:2, \n" " SeqId:62>> \n" " || SeqId <- [64] >>">>, Config), - ok. -otp_8188(doc) -> - ["Clauses on the same line."]; -otp_8188(suite) -> []; +%% Clauses on the same line. otp_8188(Config) when is_list(Config) -> %% This example covers the bug report: Test = <<"-module(t). @@ -1602,9 +1575,7 @@ otp_10979_hanging_node(_Config) -> ok. -compile_beam_opts(doc) -> - ["Take compiler options from beam in cover:compile_beam"]; -compile_beam_opts(suite) -> []; +%% Take compiler options from beam in cover:compile_beam compile_beam_opts(Config) when is_list(Config) -> {ok, Cwd} = file:get_cwd(), ok = file:set_cwd(proplists:get_value(priv_dir, Config)), @@ -1636,9 +1607,7 @@ compile_beam_opts(Config) when is_list(Config) -> ok = file:set_cwd(Cwd), ok. -analyse_no_beam(doc) -> - ["Don't crash if beam is not available"]; -analyse_no_beam(suite) -> []; +%% Don't crash if beam is not available analyse_no_beam(Config) when is_list(Config) -> {ok, Cwd} = file:get_cwd(), ok = file:set_cwd(proplists:get_value(data_dir, Config)), @@ -1718,8 +1687,7 @@ do_scan(Str) -> {done,{ok,T,_},C} = erl_scan:tokens([],Str,0), [ T | do_scan(C) ]. -otp_13277(doc) -> - ["PR 856. Fix a bc bug."]; +%% PR 856. Fix a bc bug. otp_13277(Config) -> Test = <<"-module(t). -export([t/0]). diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl index ef0bcf5418..7a00e81f6a 100644 --- a/lib/tools/test/cprof_SUITE.erl +++ b/lib/tools/test/cprof_SUITE.erl @@ -92,24 +92,15 @@ all() -> not_run(Config) when is_list(Config) -> {skipped,"Native code"}. -basic(suite) -> - []; -basic(doc) -> - ["Tests basic profiling"]; +%% Tests basic profiling basic(Config) when is_list(Config) -> basic_test(). -on_load(suite) -> - []; -on_load(doc) -> - ["Tests profiling of unloaded module"]; +%% Tests profiling of unloaded module on_load(Config) when is_list(Config) -> on_load_test(Config). -modules(suite) -> - []; -modules(doc) -> - ["Tests profiling of several modules"]; +%% Tests profiling of several modules modules(Config) when is_list(Config) -> modules_test(Config). diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl index 7636c31d4a..85c101f609 100644 --- a/lib/tools/test/emem_SUITE.erl +++ b/lib/tools/test/emem_SUITE.erl @@ -138,8 +138,6 @@ end_per_suite(Config) when is_list(Config) -> %% %% -live_node(doc) -> []; -live_node(suite) -> []; live_node(Config) when is_list(Config) -> {ok, EmuFlag, Port} = start_emem(Config), Nodename = mk_nodename(Config), @@ -186,8 +184,6 @@ live_node(Config) when is_list(Config) -> "17" = Res#emem_res.exit_code, emem_comment(Config). -'sparc_sunos5.8_32b_emt2.0'(doc) -> []; -'sparc_sunos5.8_32b_emt2.0'(suite) -> []; 'sparc_sunos5.8_32b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -204,8 +200,6 @@ live_node(Config) when is_list(Config) -> "0" = Res#emem_res.exit_code, emem_comment(Config). -'pc_win2000_32b_emt2.0'(doc) -> []; -'pc_win2000_32b_emt2.0'(suite) -> []; 'pc_win2000_32b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -220,8 +214,6 @@ live_node(Config) when is_list(Config) -> "0" = Res#emem_res.exit_code, emem_comment(Config). -'pc.smp_linux2.2.19pre17_32b_emt2.0'(doc) -> []; -'pc.smp_linux2.2.19pre17_32b_emt2.0'(suite) -> []; 'pc.smp_linux2.2.19pre17_32b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -240,8 +232,6 @@ live_node(Config) when is_list(Config) -> emem_comment(Config). -'powerpc_darwin7.7.0_32b_emt2.0'(doc) -> []; -'powerpc_darwin7.7.0_32b_emt2.0'(suite) -> []; 'powerpc_darwin7.7.0_32b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -256,8 +246,6 @@ live_node(Config) when is_list(Config) -> "0" = Res#emem_res.exit_code, emem_comment(Config). -'alpha_osf1v5.1_64b_emt2.0'(doc) -> []; -'alpha_osf1v5.1_64b_emt2.0'(suite) -> []; 'alpha_osf1v5.1_64b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -281,8 +269,6 @@ live_node(Config) when is_list(Config) -> emem_comment(Config) end. -'sparc_sunos5.8_64b_emt2.0'(doc) -> []; -'sparc_sunos5.8_64b_emt2.0'(suite) -> []; 'sparc_sunos5.8_64b_emt2.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "test_server" = Res#emem_res.nodename, @@ -306,8 +292,6 @@ live_node(Config) when is_list(Config) -> emem_comment(Config) end. -'sparc_sunos5.8_32b_emt1.0'(doc) -> []; -'sparc_sunos5.8_32b_emt1.0'(suite) -> []; 'sparc_sunos5.8_32b_emt1.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "" = Res#emem_res.nodename, @@ -322,8 +306,6 @@ live_node(Config) when is_list(Config) -> "0" = Res#emem_res.exit_code, emem_comment(Config). -'pc_win2000_32b_emt1.0'(doc) -> []; -'pc_win2000_32b_emt1.0'(suite) -> []; 'pc_win2000_32b_emt1.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "" = Res#emem_res.nodename, @@ -339,8 +321,6 @@ live_node(Config) when is_list(Config) -> emem_comment(Config). -'powerpc_darwin7.7.0_32b_emt1.0'(doc) -> []; -'powerpc_darwin7.7.0_32b_emt1.0'(suite) -> []; 'powerpc_darwin7.7.0_32b_emt1.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "" = Res#emem_res.nodename, @@ -355,8 +335,6 @@ live_node(Config) when is_list(Config) -> "0" = Res#emem_res.exit_code, emem_comment(Config). -'alpha_osf1v5.1_64b_emt1.0'(doc) -> []; -'alpha_osf1v5.1_64b_emt1.0'(suite) -> []; 'alpha_osf1v5.1_64b_emt1.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "" = Res#emem_res.nodename, @@ -377,8 +355,6 @@ live_node(Config) when is_list(Config) -> emem_comment(Config) end. -'sparc_sunos5.8_64b_emt1.0'(doc) -> []; -'sparc_sunos5.8_64b_emt1.0'(suite) -> []; 'sparc_sunos5.8_64b_emt1.0'(Config) when is_list(Config) -> Res = run_emem_on_casefile(Config), "" = Res#emem_res.nodename, diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl index df288c2a47..f990115697 100644 --- a/lib/tools/test/eprof_SUITE.erl +++ b/lib/tools/test/eprof_SUITE.erl @@ -31,7 +31,6 @@ suite() -> all() -> [basic, basic_option, tiny, eed]. -basic(suite) -> []; basic(Config) when is_list(Config) -> %% load eprof_test and change directory @@ -162,7 +161,6 @@ basic_option_1(Config) -> stopped = eprof:stop(), ok. -tiny(suite) -> []; tiny(Config) when is_list(Config) -> ensure_eprof_stopped(), {ok, OldCurDir} = file:get_cwd(), @@ -186,7 +184,6 @@ tiny(Config) when is_list(Config) -> ok = file:set_cwd(OldCurDir), ok. -eed(suite) -> []; eed(Config) when is_list(Config) -> ensure_eprof_stopped(), Datadir = proplists:get_value(data_dir, Config), diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl index df40cff4b4..b44816260b 100644 --- a/lib/tools/test/fprof_SUITE.erl +++ b/lib/tools/test/fprof_SUITE.erl @@ -68,10 +68,7 @@ not_run(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -stack_seq(doc) -> - ["Tests a stack recursive variant of lists:seq/3"]; -stack_seq(suite) -> - []; +%% Tests a stack recursive variant of lists:seq/3 stack_seq(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), TraceFile = filename:join(PrivDir, @@ -117,10 +114,7 @@ stack_seq(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -tail_seq(doc) -> - ["Tests a tail recursive variant of lists:seq/3"]; -tail_seq(suite) -> - []; +%% Tests a tail recursive variant of lists:seq/3 tail_seq(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), TraceFile = filename:join(PrivDir, @@ -228,10 +222,7 @@ do_create_file_slow(Config) -> %%%--------------------------------------------------------------------- -spawn_simple(doc) -> - ["Tests process spawn"]; -spawn_simple(suite) -> - []; +%% Tests process spawn spawn_simple(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), TraceFile = filename:join(PrivDir, @@ -321,11 +312,8 @@ spawn_simple_test(Start, Stop, Succ) -> %%%--------------------------------------------------------------------- -imm_tail_seq(doc) -> - ["Tests a tail recursive variant of lists:seq/3 ", - "with immediate trace to profile"]; -imm_tail_seq(suite) -> - []; +%% Tests a tail recursive variant of lists:seq/3 +%% with immediate trace to profile imm_tail_seq(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), AnalysisFile = filename:join(PrivDir, @@ -383,11 +371,8 @@ imm_tail_seq(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -imm_create_file_slow(doc) -> - ["Tests a tail recursive variant of lists:seq/3 ", - "with immediate trace to profile"]; -imm_create_file_slow(suite) -> - []; +%% Tests a tail recursive variant of lists:seq/3 +%% with immediate trace to profile imm_create_file_slow(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), DataFile = filename:join(PrivDir, @@ -432,11 +417,7 @@ imm_create_file_slow(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -imm_compile(doc) -> - ["Tests to compile a small source file ", - "with immediate trace to profile"]; -imm_compile(suite) -> - []; +%% Tests to compile a small source file with immediate trace to profile imm_compile(Config) when is_list(Config) -> ct:timetrap({minutes, 20}), DataDir = proplists:get_value(data_dir, Config), @@ -494,10 +475,7 @@ imm_compile(Config) when is_list(Config) -> %%%--------------------------------------------------------------------- -cpu_create_file_slow(doc) -> - ["Tests the create_file_slow benchmark using cpu_time"]; -cpu_create_file_slow(suite) -> - []; +%% Tests the create_file_slow benchmark using cpu_time cpu_create_file_slow(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), TraceFile = diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl index 0105c00099..573625bff7 100644 --- a/lib/tools/test/instrument_SUITE.erl +++ b/lib/tools/test/instrument_SUITE.erl @@ -32,8 +32,7 @@ all() -> ['+Mim true', '+Mis true']. -'+Mim true'(doc) -> ["Check that memory data can be read and processed"]; -'+Mim true'(suite) -> []; +%% Check that memory data can be read and processed '+Mim true'(Config) when is_list(Config) -> Node = start_slave("+Mim true"), MD = rpc:call(Node, instrument, memory_data, []), @@ -90,8 +89,7 @@ all() -> instrument:holes(MDS), {comment, "total status - sum of blocks = " ++ integer_to_list(S1-SumBlocks)}. -'+Mis true'(doc) -> ["Check that memory data can be read and processed"]; -'+Mis true'(suite) -> []; +%% Check that memory data can be read and processed '+Mis true'(Config) when is_list(Config) -> Node = start_slave("+Mis true"), [{total,[{sizes,S1,S2,S3},{blocks,B1,B2,B3}]}] diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl index bf6017e973..f536db3f6f 100644 --- a/lib/tools/test/lcnt_SUITE.erl +++ b/lib/tools/test/lcnt_SUITE.erl @@ -49,8 +49,7 @@ all() -> %% Tests %%---------------------------------------------------------------------- -t_load(suite) -> []; -t_load(doc) -> ["Load data from file."]; +%% Load data from file. t_load(Config) when is_list(Config) -> Path = proplists:get_value(data_dir, Config), Files = [filename:join([Path,"big_bang_40.lcnt"]), @@ -65,8 +64,7 @@ t_load_file([File|Files]) -> ok = lcnt:stop(), t_load_file(Files). -t_conflicts(suite) -> []; -t_conflicts(doc) -> ["API: conflicts"]; +%% API: conflicts t_conflicts(Config) when is_list(Config) -> Path = proplists:get_value(data_dir, Config), Files = [filename:join([Path,"big_bang_40.lcnt"]), @@ -99,8 +97,7 @@ test_conflicts_opts([Opt|Opts]) -> ok = lcnt:conflicts(Opt), test_conflicts_opts(Opts). -t_locations(suite) -> []; -t_locations(doc) -> ["API: locations"]; +%% API: locations t_locations(Config) when is_list(Config) -> Path = proplists:get_value(data_dir, Config), Files = [filename:join([Path,"big_bang_40.lcnt"]), @@ -132,8 +129,7 @@ test_locations_opts([Opt|Opts]) -> ok = lcnt:locations(Opt), test_locations_opts(Opts). -t_swap_keys(suite) -> []; -t_swap_keys(doc) -> ["Test interchanging port/process id with class"]; +%% Test interchanging port/process id with class t_swap_keys(Config) when is_list(Config) -> Path = proplists:get_value(data_dir, Config), Files = [filename:join([Path,"big_bang_40.lcnt"]), diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl index 9c6141528e..df6d9a8d72 100644 --- a/lib/tools/test/make_SUITE.erl +++ b/lib/tools/test/make_SUITE.erl @@ -61,7 +61,6 @@ end_per_group(_GroupName, Config) -> test_files() -> ["test1", "test2", "test3", "test4"]. -make_all(suite) -> []; make_all(Config) when is_list(Config) -> Current = prepare_data_dir(Config), up_to_date = make:all(), @@ -71,7 +70,6 @@ make_all(Config) when is_list(Config) -> ensure_no_messages(), ok. -make_files(suite) -> []; make_files(Config) when is_list(Config) -> Current = prepare_data_dir(Config), @@ -163,10 +161,7 @@ otp_6057_init(Config) when is_list(Config) -> ensure_no_messages(), Config. -otp_6057_a(suite) -> - []; -otp_6057_a(doc) -> - ["Test that make:all/0, suite/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) -> PrivDir = proplists:get_value(priv_dir, Config), @@ -214,10 +209,7 @@ otp_6057_a(Config) when is_list(Config) -> ensure_no_messages(), ok. -otp_6057_b(suite) -> - []; -otp_6057_b(doc) -> - ["Test that make:files/1 can handle a file in another directory"]; +%% Test that make:files/1 can handle a file in another directory otp_6057_b(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), @@ -250,11 +242,8 @@ otp_6057_b(Config) when is_list(Config) -> ensure_no_messages(), ok. -otp_6057_c(suite) -> - []; -otp_6057_c(doc) -> - ["Test that make:files/1 find options in Emakefile if a file is " - "given with the .erl extension there"]; +%% Test that make:files/1 find options in Emakefile if a file is +%% given with the .erl extension there otp_6057_c(Config) when is_list(Config) -> PrivDir = proplists:get_value(priv_dir, Config), diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl index 40f3911ee7..0c9b11acf1 100644 --- a/lib/tools/test/tools_SUITE.erl +++ b/lib/tools/test/tools_SUITE.erl @@ -40,10 +40,7 @@ all() -> %%% Test cases starts here. %%% -app_test(doc) -> - ["Test that the .app file does not contain any `basic' errors"]; -app_test(suite) -> - []; +%% Test that the .app file does not contain any `basic' errors app_test(Config) when is_list(Config) -> test_server:app_test(tools, tolerant). diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index 643ba9ad1a..1b01a494d7 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -101,8 +101,7 @@ end_per_suite(Conf) when is_list(Conf) -> ok. %% Seems a bit short... -addrem(suite) -> []; -addrem(doc) -> ["Simple test of removing modules"]; +%% Simple test of removing modules addrem(Conf) when is_list(Conf) -> S0 = new(), @@ -151,8 +150,7 @@ addrem(Conf) when is_list(Conf) -> _S11 = add_application(S10, AppInfo2), ok. -convert(suite) -> []; -convert(doc) -> ["Coercion of data"]; +%% Coercion of data convert(Conf) when is_list(Conf) -> S0 = new(), @@ -314,8 +312,7 @@ convert(Conf) when is_list(Conf) -> {ok, _} = eval("(App) r1->r1", [{a1,a2},{a2,a1}], S), ok. -intergraph(suite) -> []; -intergraph(doc) -> ["Inter Call Graph"]; +%% Inter Call Graph intergraph(Conf) when is_list(Conf) -> S0 = new(), @@ -446,8 +443,7 @@ intergraph(Conf) when is_list(Conf) -> ok. -lines(suite) -> []; -lines(doc) -> ["More test of Inter Call Graph, and regular expressions"]; +%% More test of Inter Call Graph, and regular expressions lines(Conf) when is_list(Conf) -> S0 = new(), @@ -565,8 +561,7 @@ lines(Conf) when is_list(Conf) -> ok. -loops(suite) -> []; -loops(doc) -> ["More Inter Call Graph, loops and \"unusual\" cases"]; +%% More Inter Call Graph, loops and "unusual" cases loops(Conf) when is_list(Conf) -> S0 = new(), @@ -621,8 +616,7 @@ loops(Conf) when is_list(Conf) -> ok. -no_data(suite) -> []; -no_data(doc) -> ["Simple tests when there is no data"]; +%% Simple tests when there is no data no_data(Conf) when is_list(Conf) -> S0 = new(), S1 = set_up(S0), @@ -642,8 +636,7 @@ no_data(Conf) when is_list(Conf) -> {ok, _} = eval("R", [r], S5), ok. -modules(suite) -> []; -modules(doc) -> ["Modules mode"]; +%% Modules mode modules(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir, "rel2"), @@ -682,8 +675,7 @@ modules(Conf) when is_list(Conf) -> ok. -add(suite) -> []; -add(doc) -> ["Add modules, applications, releases, directories"]; +%% Add modules, applications, releases, directories add(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir, "rel2"), @@ -787,8 +779,7 @@ add(Conf) when is_list(Conf) -> end, ok. -default(suite) -> []; -default(doc) -> ["Default values of options"]; +%% Default values of options default(Conf) when is_list(Conf) -> S = new(), {error, _, {invalid_options,[not_an_option]}} = @@ -807,8 +798,7 @@ default(Conf) when is_list(Conf) -> ok = xref_base:delete(S), ok. -info(suite) -> []; -info(doc) -> ["The info functions"]; +%% The info functions info(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"rel2"), @@ -862,8 +852,7 @@ info(Conf) when is_list(Conf) -> ok. -lib(suite) -> []; -lib(doc) -> ["Library modules"]; +%% Library modules lib(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"lib_test"), @@ -939,8 +928,7 @@ lib(Conf) when is_list(Conf) -> ok = file:delete(fname(Dir, "cp.beam")), ok. -read(suite) -> []; -read(doc) -> ["Data read from the Abstract Code"]; +%% Data read from the Abstract Code read(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"read"), @@ -1209,8 +1197,7 @@ read_expected(Version) -> {U, OK, OKB}. -read2(suite) -> []; -read2(doc) -> ["Data read from the Abstract Code (cont)"]; +%% Data read from the Abstract Code (cont) read2(Conf) when is_list(Conf) -> %% Handles the spawn_opt versions added in R9 (OTP-4180). %% Expected augmentations: try/catch, cond. @@ -1278,8 +1265,7 @@ read2_expected() -> {POS1,{FF,FF}}], {U, OK}. -remove(suite) -> []; -remove(doc) -> ["Remove modules, applications, releases"]; +%% Remove modules, applications, releases remove(Conf) when is_list(Conf) -> S = new(), {error, _, {no_such_module, mod}} = @@ -1291,8 +1277,7 @@ remove(Conf) when is_list(Conf) -> ok = xref_base:delete(S), ok. -replace(suite) -> []; -replace(doc) -> ["Replace modules, applications, releases"]; +%% Replace modules, applications, releases replace(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"rel2"), @@ -1365,8 +1350,7 @@ replace(Conf) when is_list(Conf) -> ok = file:delete(Ybeam), ok. -update(suite) -> []; -update(doc) -> ["The update() function"]; +%% The update() function update(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"update"), @@ -1403,8 +1387,7 @@ update(Conf) when is_list(Conf) -> ok = file:delete(Source), ok. -deprecated(suite) -> []; -deprecated(doc) -> ["OTP-4695: Deprecated functions."]; +%% OTP-4695: Deprecated functions. deprecated(Conf) when is_list(Conf) -> Dir = ?copydir, File = fname(Dir, "depr.erl"), @@ -1590,8 +1573,7 @@ deprecated(Conf) when is_list(Conf) -> ok. -trycatch(suite) -> []; -trycatch(doc) -> ["OTP-5152: try/catch, final (?) version."]; +%% OTP-5152: try/catch, final (?) version. trycatch(Conf) when is_list(Conf) -> Dir = ?copydir, File = fname(Dir, "trycatch.erl"), @@ -1638,8 +1620,7 @@ trycatch(Conf) when is_list(Conf) -> ok. -fun_mfa(suite) -> []; -fun_mfa(doc) -> ["OTP-5653: fun M:F/A."]; +%% OTP-5653: fun M:F/A. fun_mfa(Conf) when is_list(Conf) -> Dir = ?copydir, File = fname(Dir, "fun_mfa.erl"), @@ -1766,8 +1747,7 @@ fun_mfa_vars(Conf) when is_list(Conf) -> ok = file:delete(Beam), ok. -qlc(suite) -> []; -qlc(doc) -> ["OTP-5195: A bug fix when using qlc:q/1,2."]; +%% OTP-5195: A bug fix when using qlc:q/1,2. qlc(Conf) when is_list(Conf) -> Dir = ?copydir, File = fname(Dir, "qlc.erl"), @@ -1808,8 +1788,7 @@ qlc(Conf) when is_list(Conf) -> -analyze(suite) -> []; -analyze(doc) -> ["Simple analyses"]; +%% Simple analyses analyze(Conf) when is_list(Conf) -> S0 = new(), {{error, _, {invalid_options,[not_an_option]}}, _} = @@ -1871,8 +1850,7 @@ analyze(Conf) when is_list(Conf) -> ok = file:delete(Ybeam), ok. -basic(suite) -> []; -basic(doc) -> ["Use of operators"]; +%% Use of operators basic(Conf) when is_list(Conf) -> S0 = new(), @@ -2113,8 +2091,7 @@ basic(Conf) when is_list(Conf) -> {ok, _} = eval("# range strict condensation (Mod) E", 1, S), ok. -md(suite) -> []; -md(doc) -> ["The xref:m() and xref:d() functions"]; +%% The xref:m() and xref:d() functions md(Conf) when is_list(Conf) -> CopyDir = ?copydir, Dir = fname(CopyDir,"md"), @@ -2156,8 +2133,7 @@ md(Conf) when is_list(Conf) -> ok = file:delete(Ybeam), ok. -q(suite) -> []; -q(doc) -> ["User queries"]; +%% User queries q(Conf) when is_list(Conf) -> S0 = new(), {ok, _} = eval("'foo", parse_error, S0), @@ -2168,8 +2144,7 @@ q(Conf) when is_list(Conf) -> {ok, _S2} = xref_base:forget(S1, 'TT'), ok. -variables(suite) -> []; -variables(doc) -> ["Setting and getting values of query variables"]; +%% Setting and getting values of query variables variables(Conf) when is_list(Conf) -> Sa = new(), {{error, _, {invalid_options,[not_an_option]}}, _} = @@ -2268,8 +2243,7 @@ variables(Conf) when is_list(Conf) -> ok = file:delete(Beam), ok. -unused_locals(suite) -> []; -unused_locals(doc) -> ["OTP-5071. Too many unused functions."]; +%% OTP-5071. Too many unused functions. unused_locals(Conf) when is_list(Conf) -> Dir = ?copydir, @@ -2324,8 +2298,7 @@ unused_locals(Conf) when is_list(Conf) -> ok. -format_error(suite) -> []; -format_error(doc) -> ["Format error messages"]; +%% Format error messages format_error(Conf) when is_list(Conf) -> {ok, _Pid} = start(s), ok = xref:set_default(s, [{verbose,false}, {warnings, false}]), @@ -2392,8 +2365,7 @@ format_error(Conf) when is_list(Conf) -> xref:stop(s), ok. -otp_7423(suite) -> []; -otp_7423(doc) -> ["OTP-7423. Xref scanner bug."]; +%% OTP-7423. Xref scanner bug. otp_7423(Conf) when is_list(Conf) -> {ok, _Pid} = start(s), S = "E | [compiler] : App || [{erlang, @@ -2403,8 +2375,7 @@ otp_7423(Conf) when is_list(Conf) -> xref:stop(s), ok. -otp_7831(suite) -> []; -otp_7831(doc) -> ["OTP-7831. Allow anonymous Xref processes."]; +%% OTP-7831. Allow anonymous Xref processes. otp_7831(Conf) when is_list(Conf) -> {ok, Pid1} = xref:start([]), xref:stop(Pid1), @@ -2412,9 +2383,7 @@ otp_7831(Conf) when is_list(Conf) -> xref:stop(Pid2), ok. -otp_10192(suite) -> []; -otp_10192(doc) -> - ["OTP-10192. Allow filenames with character codes greater than 126."]; +%% OTP-10192. Allow filenames with character codes greater than 126. otp_10192(Conf) when is_list(Conf) -> PrivDir = ?privdir, {ok, _Pid} = xref:start(s), |