From 015858b2d3265808fd2714e54a6d0dac38bea642 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Wed, 11 Jul 2012 20:36:41 +0200 Subject: Simplify eunit --- src/rebar_eunit.erl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl index dcc46a1..f197f99 100644 --- a/src/rebar_eunit.erl +++ b/src/rebar_eunit.erl @@ -140,8 +140,7 @@ eunit(Config, _AppFile) -> ModuleBeamFiles = BeamFiles ++ OtherBeamFiles, Modules = [rebar_utils:beam_to_mod(?EUNIT_DIR, N) || N <- ModuleBeamFiles], SrcModules = [rebar_utils:erl_to_mod(M) || M <- SrcErls], - Suites = get_suites(), - FilteredModules = filtered_modules(Modules, Suites), + FilteredModules = filter_modules(Modules), {ok, CoverLog} = cover_init(Config, ModuleBeamFiles), @@ -183,13 +182,14 @@ eunit_dir() -> ebin_dir() -> filename:join(rebar_utils:get_cwd(), "ebin"). -get_suites() -> - Suites = rebar_utils:get_deprecated_global(suite, suites, [], "soon"), - [list_to_atom(Suite) || Suite <- string:tokens(Suites, ",")]. +filter_modules(Modules) -> + RawSuites = rebar_utils:get_deprecated_global(suite, suites, [], "soon"), + Suites = [list_to_atom(Suite) || Suite <- string:tokens(RawSuites, ",")], + filter_modules(Modules, Suites). -filtered_modules(Modules, []) -> +filter_modules(Modules, []) -> Modules; -filtered_modules(Modules, Suites) -> +filter_modules(Modules, Suites) -> [M || M <- Modules, lists:member(M, Suites)]. perform_eunit(Config, FilteredModules) -> -- cgit v1.1