mirror of
https://github.com/correl/rebar.git
synced 2024-12-18 03:00:17 +00:00
New eunit param skip_app, allow suite to be a list
This patch allows the 'suite' argument to eunit to be a comma separated list of modules to test instead of being a single module. This allows fine-grained testing when one test suite interferes with another and its not clear which suite is causing the problem. It also lets you run the test suite in a different order for a similar reason. The other enhancement is to add a new eunit parameter; 'skip_app' which like 'app' is a comma separated list of modules to skip testing on. This parameter is only applied if the app parameter is not passed. Its purpose is to avoid forcing you to specify all the apps to test if you only want to skip a handful and there are many apps to test.
This commit is contained in:
parent
153aabee9b
commit
310a1bb7ea
1 changed files with 25 additions and 8 deletions
|
@ -59,9 +59,23 @@ eunit(Config, AppFile) ->
|
||||||
%% of apps on which we want to run eunit
|
%% of apps on which we want to run eunit
|
||||||
case rebar_config:get_global(app, undefined) of
|
case rebar_config:get_global(app, undefined) of
|
||||||
undefined ->
|
undefined ->
|
||||||
%% No app parameter specified, run everything..
|
%% No app parameter specified, check the skip list..
|
||||||
ok;
|
case rebar_config:get_global(skip_app, undefined) of
|
||||||
|
undefined ->
|
||||||
|
%% no skip list, run everything..
|
||||||
|
ok;
|
||||||
|
SkipApps ->
|
||||||
|
TargetApps = [list_to_atom(A) ||
|
||||||
|
A <- string:tokens(SkipApps, ",")],
|
||||||
|
ThisApp = rebar_app_utils:app_name(AppFile),
|
||||||
|
case lists:member(ThisApp, TargetApps) of
|
||||||
|
false ->
|
||||||
|
ok;
|
||||||
|
true ->
|
||||||
|
?DEBUG("Skipping eunit on app: ~p\n", [ThisApp]),
|
||||||
|
throw(ok)
|
||||||
|
end
|
||||||
|
end;
|
||||||
Apps ->
|
Apps ->
|
||||||
TargetApps = [list_to_atom(A) || A <- string:tokens(Apps, ",")],
|
TargetApps = [list_to_atom(A) || A <- string:tokens(Apps, ",")],
|
||||||
ThisApp = rebar_app_utils:app_name(AppFile),
|
ThisApp = rebar_app_utils:app_name(AppFile),
|
||||||
|
@ -144,7 +158,7 @@ ebin_dir() ->
|
||||||
|
|
||||||
perform_eunit(Config, Modules) ->
|
perform_eunit(Config, Modules) ->
|
||||||
%% suite defined, so only specify the module that relates to the
|
%% suite defined, so only specify the module that relates to the
|
||||||
%% suite (if any)
|
%% suite (if any). Suite can be a comma seperated list of modules to run.
|
||||||
Suite = rebar_config:get_global(suite, undefined),
|
Suite = rebar_config:get_global(suite, undefined),
|
||||||
EunitOpts = get_eunit_opts(Config),
|
EunitOpts = get_eunit_opts(Config),
|
||||||
|
|
||||||
|
@ -162,8 +176,9 @@ perform_eunit(Config, Modules) ->
|
||||||
|
|
||||||
perform_eunit(EunitOpts, Modules, undefined) ->
|
perform_eunit(EunitOpts, Modules, undefined) ->
|
||||||
(catch eunit:test(Modules, EunitOpts));
|
(catch eunit:test(Modules, EunitOpts));
|
||||||
perform_eunit(EunitOpts, _Modules, Suite) ->
|
perform_eunit(EunitOpts, _Modules, Suites) ->
|
||||||
(catch eunit:test(list_to_atom(Suite), EunitOpts)).
|
(catch eunit:test([list_to_atom(Suite) ||
|
||||||
|
Suite <- string:tokens(Suites, ",")], EunitOpts)).
|
||||||
|
|
||||||
get_eunit_opts(Config) ->
|
get_eunit_opts(Config) ->
|
||||||
%% Enable verbose in eunit if so requested..
|
%% Enable verbose in eunit if so requested..
|
||||||
|
@ -229,8 +244,10 @@ perform_cover(true, Config, BeamFiles, SrcModules) ->
|
||||||
cover_analyze(_Config, [], _SrcModules) ->
|
cover_analyze(_Config, [], _SrcModules) ->
|
||||||
ok;
|
ok;
|
||||||
cover_analyze(Config, Modules, SrcModules) ->
|
cover_analyze(Config, Modules, SrcModules) ->
|
||||||
Suite = list_to_atom(rebar_config:get_global(suite, "")),
|
%% suite can be a comma seperated list of modules to test
|
||||||
FilteredModules = [M || M <- Modules, M =/= Suite],
|
Suite = [list_to_atom(S) ||
|
||||||
|
S <- string:tokens(rebar_config:get_global(suite, ""), ",")],
|
||||||
|
FilteredModules = [M || M <- Modules, lists:member(M, Suite)],
|
||||||
|
|
||||||
%% Generate coverage info for all the cover-compiled modules
|
%% Generate coverage info for all the cover-compiled modules
|
||||||
Coverage = [cover_analyze_mod(M) || M <- FilteredModules],
|
Coverage = [cover_analyze_mod(M) || M <- FilteredModules],
|
||||||
|
|
Loading…
Reference in a new issue