summaryrefslogtreecommitdiff
path: root/src/rebar_ct.erl
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamt@netbsd.org>2014-05-30 14:48:15 +0900
committerYAMAMOTO Takashi <yamt@netbsd.org>2014-05-30 14:48:15 +0900
commit5e91322e4ab0383068463844ead85ff15c0fba9e (patch)
treebcb8e3955e3f5bbdc0f2821fd56d94d82a457c0b /src/rebar_ct.erl
parentad588a70b736162626cbe75671ca2ab785d85428 (diff)
downloadrebar-5e91322e4ab0383068463844ead85ff15c0fba9e.tar.gz
use the effective deps dir instead of hardcoding "deps"
suggested by @tuncer
Diffstat (limited to 'src/rebar_ct.erl')
-rw-r--r--src/rebar_ct.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl
index 4a6f11e..c075e8c 100644
--- a/src/rebar_ct.erl
+++ b/src/rebar_ct.erl
@@ -210,7 +210,7 @@ make_cmd(TestDir, RawLogDir, Config) ->
CodeDirs = [io_lib:format("\"~s\"", [Dir]) ||
Dir <- [EbinDir|NonLibCodeDirs]],
CodePathString = string:join(CodeDirs, " "),
- Cmd = case get_ct_specs(Cwd) of
+ Cmd = case get_ct_specs(Config, Cwd) of
undefined ->
?FMT("~s"
" -pa ~s"
@@ -260,8 +260,8 @@ build_name(Config) ->
get_extra_params(Config) ->
rebar_config:get_local(Config, ct_extra_params, "").
-get_ct_specs(Cwd) ->
- case collect_glob(Cwd, ".*\.test\.spec\$") of
+get_ct_specs(Config, Cwd) ->
+ case collect_glob(Config, Cwd, ".*\.test\.spec\$") of
[] -> undefined;
[Spec] ->
" -spec " ++ Spec;
@@ -275,7 +275,7 @@ get_cover_config(Config, Cwd) ->
false ->
"";
true ->
- case collect_glob(Cwd, ".*cover\.spec\$") of
+ case collect_glob(Config, Cwd, ".*cover\.spec\$") of
[] ->
?DEBUG("No cover spec found: ~s~n", [Cwd]),
"";
@@ -287,14 +287,15 @@ get_cover_config(Config, Cwd) ->
end
end.
-collect_glob(Cwd, Glob) ->
+collect_glob(Config, Cwd, Glob) ->
+ {true, Deps} = rebar_deps:get_deps_dir(Config),
CwdParts = filename:split(Cwd),
filelib:fold_files(Cwd, Glob, true, fun(F, Acc) ->
%% Ignore any specs under the deps/ directory. Do this pulling
%% the dirname off the F and then splitting it into a list.
Parts = filename:split(filename:dirname(F)),
Parts2 = remove_common_prefix(Parts, CwdParts),
- case lists:member("deps", Parts2) of
+ case lists:member(Deps, Parts2) of
true ->
Acc; % There is a directory named "deps" in path
false ->