summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralisdair sullivan <alisdairsullivan@yahoo.ca>2016-05-15 17:25:54 -0700
committeralisdair sullivan <alisdairsullivan@yahoo.ca>2016-05-15 17:27:00 -0700
commitee47316113901fd81060497934eaa0f22a21bbc9 (patch)
treefae9b27a579a956b00333052adfc836b5b5c3d42 /src
parent89b25b2d8206f00749759e3b666689aed6d85feb (diff)
don't generated coverage for `extra_src_dirs`
closes #1057 and #1179
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_cover.erl19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index c915141..e555a9b 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -296,8 +296,7 @@ strip_coverdir(File) ->
cover_compile(State, apps) ->
Apps = filter_checkouts(rebar_state:project_apps(State)),
AppDirs = app_dirs(Apps),
- ExtraDirs = extra_src_dirs(State, Apps),
- cover_compile(State, lists:filter(fun(D) -> ec_file:is_dir(D) end, AppDirs ++ ExtraDirs));
+ cover_compile(State, lists:filter(fun(D) -> ec_file:is_dir(D) end, AppDirs));
cover_compile(State, Dirs) ->
%% start the cover server if necessary
{ok, CoverPid} = start_cover(),
@@ -322,21 +321,7 @@ app_dirs(Apps) ->
lists:foldl(fun app_ebin_dirs/2, [], Apps).
app_ebin_dirs(App, Acc) ->
- AppDir = rebar_app_info:ebin_dir(App),
- ExtraDirs = rebar_dir:extra_src_dirs(rebar_app_info:opts(App), []),
- OutDir = rebar_app_info:out_dir(App),
- [AppDir] ++ [filename:join([OutDir, D]) || D <- ExtraDirs] ++ Acc.
-
-extra_src_dirs(State, Apps) ->
- BaseDir = rebar_state:dir(State),
- F = fun(App) -> rebar_app_info:dir(App) == BaseDir end,
- %% check that this app hasn't already been dealt with
- Extras = case lists:any(F, Apps) of
- false -> rebar_dir:extra_src_dirs(rebar_state:opts(State), []);
- true -> []
- end,
- OutDir = rebar_dir:base_dir(State),
- [filename:join([OutDir, "extras", D]) || D <- Extras].
+ [rebar_app_info:ebin_dir(App)|Acc].
filter_checkouts(Apps) -> filter_checkouts(Apps, []).